From a499e6f0888fa5876c61d625f2733f560ef664ce Mon Sep 17 00:00:00 2001 From: jrfnl Date: Mon, 16 Sep 2024 20:21:12 +0200 Subject: [PATCH 1/5] .gitattributes: various small updates * Add `.editorconfig` to the files to be `export-ignore`d. * Add docs explaining what's being done. * Align the export-ignore's. --- .gitattributes | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/.gitattributes b/.gitattributes index 62575cea0..1c8fd7a27 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,11 +1,25 @@ -.github/ export-ignore -build/ export-ignore -docs/ export-ignore -examples/ export-ignore -tests/ export-ignore -.codecov.yml export-ignore -.gitattributes export-ignore -.gitignore export-ignore -.phpcs.xml.dist export-ignore -phpdoc.dist.xml export-ignore -phpunit.xml.dist export-ignore +# +# Exclude these files from release archives. +# This will also make them unavailable when using Composer with `--prefer-dist`. +# If you develop for this repo using Composer, use `--prefer-source`. +# https://www.reddit.com/r/PHP/comments/2jzp6k/i_dont_need_your_tests_in_my_production/ +# https://blog.madewithlove.be/post/gitattributes/ +# +.github/ export-ignore +build/ export-ignore +docs/ export-ignore +examples/ export-ignore +tests/ export-ignore +.codecov.yml export-ignore +.editorconfig export-ignore +.gitattributes export-ignore +.gitignore export-ignore +.phpcs.xml.dist export-ignore +phpdoc.dist.xml export-ignore +phpunit.xml.dist export-ignore + +# +# Auto detect text files and perform LF normalization +# https://pablorsk.medium.com/be-a-git-ninja-the-gitattributes-file-e58c07c9e915 +# +* text=auto From e7d87d9f949083b38eee965a16ca9b12a4729666 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 08:39:06 +0000 Subject: [PATCH 2/5] GH Actions: Bump codecov/codecov-action from 4 to 5 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4 to 5. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v4...v5) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index edeb5f550..538de980f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -137,7 +137,7 @@ jobs: - name: Send coverage report to Codecov if: ${{ success() && matrix.coverage == true }} - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: token: "${{ secrets.CODECOV_TOKEN }}" files: ./clover.xml From 4bd643deee2c8645150caae45a8d6d6caf354284 Mon Sep 17 00:00:00 2001 From: jrfnl Date: Fri, 22 Nov 2024 01:53:25 +0100 Subject: [PATCH 3/5] GH Actions: PHP 8.4 has been released * Builds against PHP 8.4 are no longer allowed to fail. * Add _allowed to fail_ build against PHP 8.5. Ref: https://www.php.net/releases/8.4/en.php --- .github/workflows/lint.yml | 8 ++++---- .github/workflows/test.yml | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index cb97bed32..87ca6cf2d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,10 +20,10 @@ jobs: strategy: matrix: # Lint against the high/low versions of each PHP major + nightly. - php: ['5.6', '7.0', '7.4', '8.0', '8.3', '8.4'] + php: ['5.6', '7.0', '7.4', '8.0', '8.4', '8.5'] name: "Lint: PHP ${{ matrix.php }}" - continue-on-error: ${{ matrix.php == '8.4' }} + continue-on-error: ${{ matrix.php == '8.5' }} steps: - name: Checkout code @@ -40,7 +40,7 @@ jobs: # Install dependencies and handle caching in one go. # @link https://github.com/marketplace/actions/install-composer-dependencies - name: Install Composer dependencies - normal - if: ${{ matrix.php != '8.4' }} + if: ${{ matrix.php != '8.5' }} uses: "ramsey/composer-install@v3" with: # Bust the cache at least once a month - output format: YYYY-MM. @@ -48,7 +48,7 @@ jobs: # For PHP "nightly", we need to install with ignore platform reqs. - name: Install Composer dependencies - with ignore platform - if: ${{ matrix.php == '8.4' }} + if: ${{ matrix.php == '8.5' }} uses: "ramsey/composer-install@v3" with: composer-options: "--ignore-platform-req=php+" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 538de980f..2ded50943 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,18 +23,18 @@ jobs: # Keys: # - coverage: Whether to run the tests with code coverage. matrix: - php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.4'] + php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.5'] coverage: [false] include: # Run code coverage on high/low PHP. - php: '5.6' coverage: true - - php: '8.3' + - php: '8.4' coverage: true name: "Test: PHP ${{ matrix.php }}" - continue-on-error: ${{ matrix.php == '8.4' }} + continue-on-error: ${{ matrix.php == '8.5' }} steps: - name: Checkout code @@ -60,7 +60,7 @@ jobs: # Install dependencies and handle caching in one go. # @link https://github.com/marketplace/actions/install-composer-dependencies - name: Install Composer dependencies - normal - if: ${{ matrix.php != '8.4' }} + if: ${{ matrix.php != '8.5' }} uses: "ramsey/composer-install@v3" with: # Bust the cache at least once a month - output format: YYYY-MM. @@ -68,7 +68,7 @@ jobs: # For PHP "nightly", we need to install with ignore platform reqs. - name: Install Composer dependencies - with ignore platform - if: ${{ matrix.php == '8.4' }} + if: ${{ matrix.php == '8.5' }} uses: "ramsey/composer-install@v3" with: composer-options: "--ignore-platform-req=php+" From 58bd35c11f7ce2f7d0ef8fb141c8be0b79d7b82b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 09:10:40 +0000 Subject: [PATCH 4/5] :lock_with_ink_pen: Update certificate bundle --- certificates/cacert.pem | 32 +++++++++++++++++++++++++++++++- certificates/cacert.pem.sha256 | 2 +- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/certificates/cacert.pem b/certificates/cacert.pem index f2c24a589..eb11b2fd1 100644 --- a/certificates/cacert.pem +++ b/certificates/cacert.pem @@ -1,7 +1,7 @@ ## ## Bundle of CA Root Certificates ## -## Certificate data from Mozilla as of: Tue Sep 24 03:12:04 2024 GMT +## Certificate data from Mozilla as of: Tue Nov 26 13:58:25 2024 GMT ## ## Find updated versions here: https://curl.se/docs/caextract.html ## @@ -2602,6 +2602,36 @@ vLtoURMMA/cVi4RguYv/Uo7njLwcAjA8+RHUjE7AwWHCFUyqqx0LMV87HOIAl0Qx5v5zli/altP+ CAezNIm8BZ/3Hobui3A= -----END CERTIFICATE----- +GLOBALTRUST 2020 +================ +-----BEGIN CERTIFICATE----- +MIIFgjCCA2qgAwIBAgILWku9WvtPilv6ZeUwDQYJKoZIhvcNAQELBQAwTTELMAkGA1UEBhMCQVQx +IzAhBgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVT +VCAyMDIwMB4XDTIwMDIxMDAwMDAwMFoXDTQwMDYxMDAwMDAwMFowTTELMAkGA1UEBhMCQVQxIzAh +BgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVTVCAy +MDIwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAri5WrRsc7/aVj6B3GyvTY4+ETUWi +D59bRatZe1E0+eyLinjF3WuvvcTfk0Uev5E4C64OFudBc/jbu9G4UeDLgztzOG53ig9ZYybNpyrO +VPu44sB8R85gfD+yc/LAGbaKkoc1DZAoouQVBGM+uq/ufF7MpotQsjj3QWPKzv9pj2gOlTblzLmM +CcpL3TGQlsjMH/1WljTbjhzqLL6FLmPdqqmV0/0plRPwyJiT2S0WR5ARg6I6IqIoV6Lr/sCMKKCm +fecqQjuCgGOlYx8ZzHyyZqjC0203b+J+BlHZRYQfEs4kUmSFC0iAToexIiIwquuuvuAC4EDosEKA +A1GqtH6qRNdDYfOiaxaJSaSjpCuKAsR49GiKweR6NrFvG5Ybd0mN1MkGco/PU+PcF4UgStyYJ9OR +JitHHmkHr96i5OTUawuzXnzUJIBHKWk7buis/UDr2O1xcSvy6Fgd60GXIsUf1DnQJ4+H4xj04KlG +DfV0OoIu0G4skaMxXDtG6nsEEFZegB31pWXogvziB4xiRfUg3kZwhqG8k9MedKZssCz3AwyIDMvU +clOGvGBG85hqwvG/Q/lwIHfKN0F5VVJjjVsSn8VoxIidrPIwq7ejMZdnrY8XD2zHc+0klGvIg5rQ +mjdJBKuxFshsSUktq6HQjJLyQUp5ISXbY9e2nKd+Qmn7OmMCAwEAAaNjMGEwDwYDVR0TAQH/BAUw +AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFNwuH9FhN3nkq9XVsxJxaD1qaJwiMB8GA1Ud +IwQYMBaAFNwuH9FhN3nkq9XVsxJxaD1qaJwiMA0GCSqGSIb3DQEBCwUAA4ICAQCR8EICaEDuw2jA +VC/f7GLDw56KoDEoqoOOpFaWEhCGVrqXctJUMHytGdUdaG/7FELYjQ7ztdGl4wJCXtzoRlgHNQIw +4Lx0SsFDKv/bGtCwr2zD/cuz9X9tAy5ZVp0tLTWMstZDFyySCstd6IwPS3BD0IL/qMy/pJTAvoe9 +iuOTe8aPmxadJ2W8esVCgmxcB9CpwYhgROmYhRZf+I/KARDOJcP5YBugxZfD0yyIMaK9MOzQ0MAS +8cE54+X1+NZK3TTN+2/BT+MAi1bikvcoskJ3ciNnxz8RFbLEAwW+uxF7Cr+obuf/WEPPm2eggAe2 +HcqtbepBEX4tdJP7wry+UUTF72glJ4DjyKDUEuzZpTcdN3y0kcra1LGWge9oXHYQSa9+pTeAsRxS +vTOBTI/53WXZFM2KJVj04sWDpQmQ1GwUY7VA3+vA/MRYfg0UFodUJ25W5HCEuGwyEn6CMUO+1918 +oa2u1qsgEu8KwxCMSZY13At1XrFP1U80DhEgB3VDRemjEdqso5nCtnkn4rnvyOL2NSl6dPrFf4IF +YqYK6miyeUcGbvJXqBUzxvd4Sj1Ce2t+/vdG6tHrju+IaFvowdlxfv1k7/9nR4hYJS8+hge9+6jl +gqispdNpQ80xiEmEU5LAsTkbOYMBMMTyqfrQA71yN2BWHzZ8vTmR9W0Nv3vXkg== +-----END CERTIFICATE----- + ANF Secure Server Root CA ========================= -----BEGIN CERTIFICATE----- diff --git a/certificates/cacert.pem.sha256 b/certificates/cacert.pem.sha256 index ebf67818e..f419221c7 100644 --- a/certificates/cacert.pem.sha256 +++ b/certificates/cacert.pem.sha256 @@ -1 +1 @@ -189d3cf6d103185fba06d76c1af915263c6d42225481a1759e853b33ac857540 cacert.pem +bb1782d281fe60d4a2dcf41bc229abe3e46c280212597d4abcc25bddf667739b cacert.pem From 60d94ba2ba0e6cb94e47dc2dd6f9b126042dcb98 Mon Sep 17 00:00:00 2001 From: jrfnl Date: Wed, 11 Dec 2024 10:38:40 +0100 Subject: [PATCH 5/5] Changelog for release 2.0.14 * Includes updating the version number constant. --- CHANGELOG.md | 11 +++++++++++ src/Requests.php | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 112068d4c..639db28ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,17 @@ Changelog ========= +2.0.14 +------ + +### Overview of changes +- Update bundled certificates as of 2024-11-26. [#910] +- Confirmed compatibility with PHP 8.4. + No new changes were needed, so Request 2.0.11 and higher can be considered compatible with PHP 8.4. +- Various other general housekeeping. + +[#910]: https://github.com/WordPress/Requests/pull/910 + 2.0.13 ------ diff --git a/src/Requests.php b/src/Requests.php index 0a1a0fbed..0c36aa4f8 100644 --- a/src/Requests.php +++ b/src/Requests.php @@ -148,7 +148,7 @@ class Requests { * * @var string */ - const VERSION = '2.0.13'; + const VERSION = '2.0.14'; /** * Selected transport name