Skip to content

Commit 2e5b843

Browse files
authored
Merge pull request #1042 from WordPress/release/2.0.18
2 parents 07f27f9 + b47c95f commit 2e5b843

11 files changed

Lines changed: 70 additions & 42 deletions

File tree

.github/workflows/cs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Checkout code
23-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
23+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2424
with:
2525
persist-credentials: false
2626

@@ -44,12 +44,12 @@ jobs:
4444

4545
steps:
4646
- name: Checkout code
47-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
47+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4848
with:
4949
persist-credentials: false
5050

5151
- name: Install PHP
52-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
52+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
5353
with:
5454
php-version: '7.4'
5555
coverage: none
@@ -58,7 +58,7 @@ jobs:
5858
# Install dependencies and handle caching in one go.
5959
# @link https://github.com/marketplace/actions/install-composer-dependencies
6060
- name: Install Composer dependencies
61-
uses: "ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520" # 3.1.1
61+
uses: "ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda" # 4.0.0
6262

6363
# Check the code-style consistency of the PHP files.
6464
- name: Check PHP code style

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727

2828
steps:
2929
- name: Checkout code
30-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
30+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3131
with:
3232
persist-credentials: false
3333

3434
- name: Install PHP
35-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
35+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
3636
with:
3737
php-version: ${{ matrix.php }}
3838
ini-values: error_reporting=-1, display_errors=On, display_startup_errors=On, log_errors_max_len=0
@@ -42,7 +42,7 @@ jobs:
4242
# Install dependencies and handle caching in one go.
4343
# @link https://github.com/marketplace/actions/install-composer-dependencies
4444
- name: Install Composer dependencies
45-
uses: "ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520" # 3.1.1
45+
uses: "ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda" # 4.0.0
4646
with:
4747
# For PHP "nightly", we need to install with ignore platform reqs as not all dependencies may allow it yet.
4848
composer-options: ${{ matrix.php == '8.6' && '--ignore-platform-req=php+' || '' }}

.github/workflows/quicktest.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727

2828
steps:
2929
- name: Checkout code
30-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
30+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3131
with:
3232
persist-credentials: false
3333

3434
- name: Install PHP
35-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
35+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
3636
with:
3737
php-version: ${{ matrix.php }}
3838
ini-values: zend.assertions=1, error_reporting=-1, display_errors=On, display_startup_errors=On, log_errors_max_len=0
@@ -50,10 +50,10 @@ jobs:
5050
# Install dependencies and handle caching in one go.
5151
# @link https://github.com/marketplace/actions/install-composer-dependencies
5252
- name: Install Composer dependencies - normal
53-
uses: "ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520" # 3.1.1
53+
uses: "ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda" # 4.0.0
5454

5555
- name: Setup Python
56-
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
56+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
5757
with:
5858
python-version: '3.14'
5959

.github/workflows/reusable-update-cacert.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ jobs:
3131
fi
3232
3333
- name: Checkout code
34-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
34+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3535
with:
3636
persist-credentials: false
3737

3838
- name: Restore etags cache for certificate files
39-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
39+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
4040
with:
4141
path: certificates/etag-*.txt
4242
key: curl-etag-${{ hashFiles('certificates/cacert.pem') }}-${{ hashFiles('certificates/cacert.pem.sha256') }}
@@ -64,7 +64,7 @@ jobs:
6464
run: echo "DATE=$(/bin/date -u "+%F")" >> "$GITHUB_OUTPUT"
6565

6666
- name: Create pull request
67-
uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676 # v7.0.11
67+
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
6868
with:
6969
base: ${{ steps.branches.outputs.BASE }}
7070
branch: ${{ steps.branches.outputs.PR_BRANCH }}

.github/workflows/test.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ jobs:
3838

3939
steps:
4040
- name: Checkout code
41-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
41+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4242
with:
4343
persist-credentials: false
4444

4545
- name: Install PHP
46-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
46+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
4747
with:
4848
php-version: ${{ matrix.php }}
4949
ini-values: zend.assertions=1, error_reporting=-1, display_errors=On, display_startup_errors=On, log_errors_max_len=0
@@ -62,7 +62,7 @@ jobs:
6262
# Install dependencies and handle caching in one go.
6363
# @link https://github.com/marketplace/actions/install-composer-dependencies
6464
- name: Install Composer dependencies
65-
uses: "ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520" # 3.1.1
65+
uses: "ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda" # 4.0.0
6666
with:
6767
# For PHP "nightly", we need to install with ignore platform reqs as not all dependencies may allow it yet.
6868
composer-options: ${{ matrix.php == '8.6' && '--ignore-platform-req=php+' || '' }}
@@ -73,7 +73,7 @@ jobs:
7373
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
7474

7575
- name: Setup Python
76-
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
76+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
7777
with:
7878
python-version: '3.14'
7979

@@ -118,7 +118,7 @@ jobs:
118118

119119
- name: Run the unit tests with code coverage
120120
if: ${{ matrix.coverage == true }}
121-
run: vendor/bin/phpunit --coverage-clover clover.xml
121+
run: vendor/bin/phpunit
122122

123123
- name: Stop proxy server
124124
continue-on-error: true
@@ -132,9 +132,9 @@ jobs:
132132

133133
- name: Send coverage report to Codecov
134134
if: ${{ success() && matrix.coverage == true && github.event.repository.fork == false }}
135-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
135+
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
136136
with:
137137
token: "${{ secrets.CODECOV_TOKEN }}"
138-
files: ./clover.xml
138+
files: ./tests/coverage/clover.xml
139139
fail_ci_if_error: true
140140
verbose: true

.github/workflows/update-website.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ jobs:
4949
fi
5050
5151
- name: Checkout code
52-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
52+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5353
with:
5454
ref: ${{ steps.base_branch.outputs.BRANCH }}
5555
persist-credentials: false
5656

5757
- name: Install PHP
58-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
58+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
5959
with:
60-
php-version: '8.1'
60+
php-version: '8.4'
6161
ini-values: display_errors=On, display_startup_errors=On
6262
coverage: none
6363
tools: phpdoc
@@ -74,7 +74,7 @@ jobs:
7474
# Retention is normally 90 days, but this artifact is only for review
7575
# and use in the next step, so no need to keep it for more than a day.
7676
- name: Upload the artifacts folder
77-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
77+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
7878
if: ${{ success() }}
7979
with:
8080
name: website-updates
@@ -112,13 +112,13 @@ jobs:
112112
fi
113113
114114
- name: Checkout code
115-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
115+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
116116
with:
117117
ref: gh-pages
118118
persist-credentials: false
119119

120120
- name: Download the prepared artifacts
121-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
121+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
122122
with:
123123
name: website-updates
124124
path: artifacts
@@ -172,7 +172,7 @@ jobs:
172172

173173
- name: Create pull request
174174
if: github.event_name != 'pull_request'
175-
uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676 # v7.0.11
175+
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
176176
with:
177177
base: gh-pages
178178
branch: feature/auto-ghpages-update-${{ steps.get_pr_info.outputs.REF }}
@@ -193,7 +193,7 @@ jobs:
193193

194194
# Test that the site builds correctly.
195195
- name: Set up Ruby
196-
uses: ruby/setup-ruby@d697be2f83c6234b20877c3b5eac7a7f342f0d0c # v1.269.0
196+
uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0
197197
with:
198198
# Use the version as per https://pages.github.com/versions/.
199199
ruby-version: 3.3.4

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
Changelog
22
=========
33

4+
2.0.18
5+
------
6+
7+
### Overview of changes
8+
- Update bundled certificates as of 2026-02-11. [#1039]
9+
- General housekeeping.
10+
11+
[#1039]: https://github.com/WordPress/Requests/pull/1039
12+
413
2.0.17
514
------
615

certificates/cacert.pem

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
## Bundle of CA Root Certificates
33
##
4-
## Certificate data from Mozilla as of: Tue Dec 2 04:12:02 2025 GMT
4+
## Certificate data from Mozilla last updated on: Wed Feb 11 18:26:30 2026 GMT
55
##
66
## Find updated versions here: https://curl.se/docs/caextract.html
77
##
@@ -15,8 +15,8 @@
1515
## an Apache+mod_ssl webserver for SSL client authentication.
1616
## Just configure this file as the SSLCACertificateFile.
1717
##
18-
## Conversion done with mk-ca-bundle.pl version 1.30.
19-
## SHA256: a903b3cd05231e39332515ef7ebe37e697262f39515a52015c23c62805b73cd0
18+
## Conversion done with mk-ca-bundle.pl version 1.32.
19+
## SHA256: 3b98d4e3ff57a326d9587c33633039c8c3a9cf0b55f7ca581d7598ff329eb1f3
2020
##
2121

2222

@@ -3480,8 +3480,8 @@ SM49BAMDA2kAMGYCMQCpKjAd0MKfkFFRQD6VVCHNFmb3U2wIFjnQEnx/Yxvf4zgAOdktUyBFCxxg
34803480
ZzFDJe0CMQCSia7pXGKDYmH5LVerVrkR3SW+ak5KGoJr3M/TvEqzPNcum9v4KGm8ay3sMaE641c=
34813481
-----END CERTIFICATE-----
34823482

3483-
OISTE Server Root RSA G1
3484-
=========================
3483+
OISTE Server Root RSA G1
3484+
========================
34853485
-----BEGIN CERTIFICATE-----
34863486
MIIFgzCCA2ugAwIBAgIQVaXZZ5Qoxu0M+ifdWwFNGDANBgkqhkiG9w0BAQwFADBLMQswCQYDVQQG
34873487
EwJDSDEZMBcGA1UECgwQT0lTVEUgRm91bmRhdGlvbjEhMB8GA1UEAwwYT0lTVEUgU2VydmVyIFJv
@@ -3509,3 +3509,21 @@ msuY33OhkKCgxeDoAaijFJzIwZqsFVAzje18KotzlUBDJvyBpCpfOZC3J8tRd/iWkx7P8nd9H0aT
35093509
olkelUTFLXVksNb54Dxp6gS1HAviRkRNQzuXSXERvSS2wq1yVAb+axj5d9spLFKebXd7Yv0PTY6Y
35103510
MjAwcRLWJTXjn/hvnLXrahut6hDTlhZyBiElxky8j3C7DOReIoMt0r7+hVu05L0=
35113511
-----END CERTIFICATE-----
3512+
3513+
e-Szigno TLS Root CA 2023
3514+
=========================
3515+
-----BEGIN CERTIFICATE-----
3516+
MIICzzCCAjGgAwIBAgINAOhvGHvWOWuYSkmYCjAKBggqhkjOPQQDBDB1MQswCQYDVQQGEwJIVTER
3517+
MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xFzAVBgNVBGEMDlZBVEhV
3518+
LTIzNTg0NDk3MSIwIAYDVQQDDBllLVN6aWdubyBUTFMgUm9vdCBDQSAyMDIzMB4XDTIzMDcxNzE0
3519+
MDAwMFoXDTM4MDcxNzE0MDAwMFowdTELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRYw
3520+
FAYDVQQKDA1NaWNyb3NlYyBMdGQuMRcwFQYDVQRhDA5WQVRIVS0yMzU4NDQ5NzEiMCAGA1UEAwwZ
3521+
ZS1Temlnbm8gVExTIFJvb3QgQ0EgMjAyMzCBmzAQBgcqhkjOPQIBBgUrgQQAIwOBhgAEAGgP36J8
3522+
PKp0iGEKjcJMpQEiFNT3YHdCnAo4YKGMZz6zY+n6kbCLS+Y53wLCMAFSAL/fjO1ZrTJlqwlZULUZ
3523+
wmgcAOAFX9pQJhzDrAQixTpN7+lXWDajwRlTEArRzT/vSzUaQ49CE0y5LBqcvjC2xN7cS53kpDzL
3524+
Ltmt3999Cd8ukv+ho2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
3525+
FgQUWYQCYlpGePVd3I8KECgj3NXW+0UwHwYDVR0jBBgwFoAUWYQCYlpGePVd3I8KECgj3NXW+0Uw
3526+
CgYIKoZIzj0EAwQDgYsAMIGHAkIBLdqu9S54tma4n7Zwf2Z0z+yOfP7AAXmazlIC58PRDHpty7Ve
3527+
7hekm9sEdu4pKeiv+62sUvTXK9Z3hBC9xdIoaDQCQTV2WnXzkoYI9bIeCvZlC9p2x1L/Cx6AcCIw
3528+
wzPbGO2E14vs7dOoY4G1VnxHx1YwlGhza9IuqbnZLBwpvQy6uWWL
3529+
-----END CERTIFICATE-----

certificates/cacert.pem.sha256

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f1407d974c5ed87d544bd931a278232e13925177e239fca370619aba63c757b4 cacert.pem
1+
b6e66569cc3d438dd5abe514d0df50005d570bfc96c14dca8f768d020cb96171 cacert.pem

phpunit.xml.dist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
<logging>
1818
<log type="coverage-html" target="tests/coverage" lowUpperBound="35" highLowerBound="90"/>
19+
<log type="coverage-clover" target="tests/coverage/clover.xml"/>
1920
</logging>
2021

2122
<filter>

0 commit comments

Comments
 (0)