Skip to content

Commit 9dfea15

Browse files
jrfnljrfnl
committed
Merge branch '3.x' into 4.x
2 parents 71b5d63 + f303f02 commit 9dfea15

File tree

9 files changed

+27
-27
lines changed

9 files changed

+27
-27
lines changed

‎.github/workflows/end-to-end-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
persist-credentials: false
4545

4646
- name: Install PHP
47-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
47+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
4848
with:
4949
php-version: ${{ matrix.php }}
5050
ini-values: "error_reporting=-1, display_errors=On, display_startup_errors=On"

‎.github/workflows/phpstan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ concurrency:
2020
jobs:
2121
phpstan:
2222
name: "PHPStan"
23-
uses: PHPCSStandards/.github/.github/workflows/reusable-phpstan.yml@0d44fe2771ae7bc1254a0a4ec596d8110d16d3dc # v1.1.1
23+
uses: PHPCSStandards/.github/.github/workflows/reusable-phpstan.yml@3d96a6d85381655b6cb0bc4eac175a78f18d9d8f # v1.1.2

‎.github/workflows/quicktest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
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: 'error_reporting=-1, display_errors=On, display_startup_errors=On'

‎.github/workflows/reusable-build-phar.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
persist-credentials: false
3939

4040
- name: Setup PHP
41-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
41+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
4242
with:
4343
php-version: ${{ inputs.phpVersion }}
4444
coverage: none

‎.github/workflows/test-requirements-check.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ jobs:
5151

5252
steps:
5353
- name: Checkout code
54-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
54+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5555
with:
5656
persist-credentials: false
5757

5858
- name: Install PHP
59-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
59+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
6060
with:
6161
php-version: ${{ matrix.php }}
6262
coverage: none
@@ -95,12 +95,12 @@ jobs:
9595

9696
steps:
9797
- name: Checkout code
98-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
98+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
9999
with:
100100
persist-credentials: false
101101

102102
- name: Install PHP
103-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
103+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
104104
with:
105105
php-version: 'latest'
106106
ini-values: 'error_reporting=-1, display_errors=On, display_startup_errors=On'
@@ -130,12 +130,12 @@ jobs:
130130

131131
steps:
132132
- name: Checkout code
133-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
133+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
134134
with:
135135
persist-credentials: false
136136

137137
- name: Install PHP
138-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
138+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
139139
with:
140140
php-version: ${{ matrix.php }}
141141
ini-values: 'error_reporting=-1, display_errors=On, display_startup_errors=On'
@@ -199,12 +199,12 @@ jobs:
199199

200200
steps:
201201
- name: Checkout code
202-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
202+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
203203
with:
204204
persist-credentials: false
205205

206206
- name: Install PHP
207-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
207+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
208208
with:
209209
php-version: ${{ matrix.php }}
210210
ini-values: 'error_reporting=-1, display_errors=On, display_startup_errors=On'
@@ -214,7 +214,7 @@ jobs:
214214
fail-fast: true
215215

216216
- name: Download the phar
217-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
217+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
218218
with:
219219
name: ${{ matrix.cmd }}-phar
220220

‎.github/workflows/test.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
- name: "libxml2: restore cache"
132132
if: ${{ matrix.libxml_minor }}
133133
id: libxml_cache_restore
134-
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
134+
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
135135
with:
136136
path: "libxml2-${{ steps.libxml_patch_version.outputs.PATCH }}"
137137
key: "${{ matrix.os }}-libxml-${{ matrix.libxml_minor }}-${{ steps.libxml_patch_version.outputs.PATCH }}"
@@ -159,7 +159,7 @@ jobs:
159159
- name: "libxml2: save cache"
160160
if: ${{ matrix.libxml_minor && steps.libxml_cache_restore.outputs.cache-hit != 'true' }}
161161
id: libxml_cache_save
162-
uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
162+
uses: actions/cache/save@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
163163
with:
164164
path: "libxml2-${{ steps.libxml_patch_version.outputs.PATCH }}"
165165
key: ${{ steps.libxml_cache_restore.outputs.cache-primary-key }}
@@ -188,7 +188,7 @@ jobs:
188188
# yamllint enable rule:line-length
189189
190190
- name: Install PHP
191-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
191+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
192192
with:
193193
php-version: ${{ matrix.php }}
194194
ini-values: ${{ steps.set_ini.outputs.PHP_INI }}
@@ -257,7 +257,7 @@ jobs:
257257

258258
- name: Download the PHPCS phar
259259
if: ${{ matrix.custom_ini == false }}
260-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
260+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
261261
with:
262262
name: phpcs-phar
263263

@@ -315,7 +315,7 @@ jobs:
315315
echo 'PHP_INI=, date.timezone=Australia/Sydney, short_open_tag=On' >> "$GITHUB_OUTPUT"
316316
317317
- name: Install PHP
318-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
318+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
319319
with:
320320
php-version: ${{ matrix.php }}
321321
ini-values: error_reporting=-1, display_errors=On, display_startup_errors=On${{ steps.set_ini.outputs.PHP_INI }}

‎.github/workflows/validate-cron.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
# Don't run the cronjob in this workflow on forks.
1818
if: ${{ github.event.repository.fork == false }}
1919

20-
uses: PHPCSStandards/.github/.github/workflows/reusable-markdownlint.yml@0d44fe2771ae7bc1254a0a4ec596d8110d16d3dc # v1.1.1
20+
uses: PHPCSStandards/.github/.github/workflows/reusable-markdownlint.yml@3d96a6d85381655b6cb0bc4eac175a78f18d9d8f # v1.1.2
2121

2222
remark:
2323
name: 'QA Markdown'
2424
# Don't run the cronjob in this workflow on forks.
2525
if: ${{ github.event.repository.fork == false }}
2626

27-
uses: PHPCSStandards/.github/.github/workflows/reusable-remark.yml@0d44fe2771ae7bc1254a0a4ec596d8110d16d3dc # v1.1.1
27+
uses: PHPCSStandards/.github/.github/workflows/reusable-remark.yml@3d96a6d85381655b6cb0bc4eac175a78f18d9d8f # v1.1.2

‎.github/workflows/validate.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
persist-credentials: false
2626

2727
- name: Install PHP
28-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
28+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
2929
with:
3030
php-version: 'latest'
3131
coverage: none
@@ -128,17 +128,17 @@ jobs:
128128
129129
yamllint:
130130
name: 'Lint Yaml'
131-
uses: PHPCSStandards/.github/.github/workflows/reusable-yamllint.yml@0d44fe2771ae7bc1254a0a4ec596d8110d16d3dc # v1.1.1
131+
uses: PHPCSStandards/.github/.github/workflows/reusable-yamllint.yml@3d96a6d85381655b6cb0bc4eac175a78f18d9d8f # v1.1.2
132132
with:
133133
strict: true
134134

135135
markdownlint:
136136
name: 'Lint Markdown'
137-
uses: PHPCSStandards/.github/.github/workflows/reusable-markdownlint.yml@0d44fe2771ae7bc1254a0a4ec596d8110d16d3dc # v1.1.1
137+
uses: PHPCSStandards/.github/.github/workflows/reusable-markdownlint.yml@3d96a6d85381655b6cb0bc4eac175a78f18d9d8f # v1.1.2
138138

139139
remark:
140140
name: 'QA Markdown'
141-
uses: PHPCSStandards/.github/.github/workflows/reusable-remark.yml@0d44fe2771ae7bc1254a0a4ec596d8110d16d3dc # v1.1.1
141+
uses: PHPCSStandards/.github/.github/workflows/reusable-remark.yml@3d96a6d85381655b6cb0bc4eac175a78f18d9d8f # v1.1.2
142142

143143
shellcheck:
144144
name: 'ShellCheck'
@@ -164,4 +164,4 @@ jobs:
164164
# The properties in the Tokens class have been deprecated.
165165
# The code in this repository should always use the constants instead.
166166
name: 'Find use of Tokens properties'
167-
uses: PHPCSStandards/.github/.github/workflows/reusable-findtokenprops.yml@a06ac9fa50dcd1d98cc581e9a4e331363a69ea09 # v1.1.0
167+
uses: PHPCSStandards/.github/.github/workflows/reusable-findtokenprops.yml@3d96a6d85381655b6cb0bc4eac175a78f18d9d8f # v1.1.2

‎.github/workflows/verify-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
run: gpg --verify ${{ steps.source.outputs.FILE }}.asc ${{ steps.source.outputs.FILE }}
147147

148148
- name: Setup PHP
149-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
149+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
150150
with:
151151
php-version: 'latest'
152152
ini-values: error_reporting=-1, display_errors=On, display_startup_errors=On
@@ -216,7 +216,7 @@ jobs:
216216
run: "echo ${{ steps.version.outputs.TAG }}"
217217

218218
- name: Setup PHP
219-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
219+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
220220
with:
221221
php-version: 'latest'
222222
ini-values: error_reporting=-1, display_errors=On, display_startup_errors=On

0 commit comments

Comments
 (0)