Skip to content

Commit 5aee176

Browse files
freddenfredden
committed
Merge remote-tracking branch 'upstream/4.x' into issue-1286/polyfill-tokenizer-const-as-int
2 parents f806de4 + 8b1c267 commit 5aee176

64 files changed

Lines changed: 737 additions & 216 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
scripts/ export-ignore
1010
src/Standards/**/Tests/ export-ignore
1111
tests/Core/**/ export-ignore
12-
tests/EndToEnd/**/ export-ignore
12+
tests/EndToEndBash/**/ export-ignore
1313
.cspell.json export-ignore
1414
.gitattributes export-ignore
1515
.gitignore export-ignore

‎.github/CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,13 +407,13 @@ To install bashunit, follow the [installation guide](https://bashunit.typeddevs.
407407

408408
You can then run the bashunit tests on Linux/Mac/WSL, like so:
409409
```bash
410-
./lib/bashunit -p tests/EndToEnd
410+
./lib/bashunit -p tests/EndToEndBash
411411
```
412412

413413
> Note: these tests will not run in the Windows native CMD shell. When on Windows, either use WSL or use the "git bash" shell.
414414
415415
When writing end-to-end tests, please use fixtures for the "files under scan" to make the tests stable.
416-
These fixtures can be placed in the `tests/EndToEnd/Fixtures` subdirectory.
416+
These fixtures can be placed in the `tests/EndToEndBash/Fixtures` subdirectory.
417417

418418
#### phpt
419419

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ jobs:
3838
run: git config --global core.autocrlf input
3939

4040
- name: Checkout code
41-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
41+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
42+
with:
43+
persist-credentials: false
4244

4345
- name: "Install bashunit"
4446
shell: bash
@@ -49,7 +51,7 @@ jobs:
4951
5052
- name: "Run bashunit tests"
5153
shell: bash
52-
run: "./lib/bashunit -p tests/EndToEnd"
54+
run: "./lib/bashunit -p tests/EndToEndBash"
5355

5456
phpt-tests:
5557
runs-on: 'ubuntu-latest'
@@ -67,7 +69,9 @@ jobs:
6769
run: git config --global core.autocrlf input
6870

6971
- name: Checkout code
70-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
72+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
73+
with:
74+
persist-credentials: false
7175

7276
- name: Install PHP
7377
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0

‎.github/workflows/happy-new-year.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ jobs:
4949
run: "echo current year: ${{ steps.year.outputs.NEW_YEAR }} - previous year: ${{ steps.year.outputs.PREVIOUS_YEAR }}"
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.branches.outputs.BASE }}
55+
persist-credentials: false
5556

5657
- name: Update the year in the copyright tag in the fixed file
5758
id: findreplace
@@ -73,7 +74,7 @@ jobs:
7374
run: exit 1
7475

7576
- name: Create pull request
76-
uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0
77+
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
7778
with:
7879
base: ${{ steps.branches.outputs.BASE }}
7980
branch: ${{ steps.branches.outputs.PR_BRANCH }}

‎.github/workflows/label-new-prs.yml‎

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

2626
steps:
2727
- name: Label new PRs
28-
uses: srvaroa/labeler@0a20eccb8c94a1ee0bed5f16859aece1c45c3e55 # v1.13.0
28+
uses: srvaroa/labeler@bf262763a8a8e191f5847873aecc0f29df84f957 # v1.14.0
2929
env:
3030
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
3131

@@ -38,10 +38,12 @@ jobs:
3838
steps:
3939
# Checkout is needed to use the `use_local_config` option.
4040
- name: Checkout code
41-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
41+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
42+
with:
43+
persist-credentials: false
4244

4345
- name: Verify changes to the labeling logic
44-
uses: srvaroa/labeler@0a20eccb8c94a1ee0bed5f16859aece1c45c3e55 # v1.13.0
46+
uses: srvaroa/labeler@bf262763a8a8e191f5847873aecc0f29df84f957 # v1.14.0
4547
with:
4648
use_local_config: true
4749
fail_on_error: true

‎.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@main
23+
uses: PHPCSStandards/.github/.github/workflows/reusable-phpstan.yml@0d44fe2771ae7bc1254a0a4ec596d8110d16d3dc # v1.1.1

‎.github/workflows/quicktest.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ jobs:
3838
run: git config --global core.autocrlf input
3939

4040
- name: Checkout code
41-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
41+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
42+
with:
43+
persist-credentials: false
4244

4345
- name: Install PHP
4446
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ jobs:
3333

3434
steps:
3535
- name: Checkout code
36-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
36+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
37+
with:
38+
persist-credentials: false
3739

3840
- name: Setup PHP
3941
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
@@ -48,15 +50,15 @@ jobs:
4850
# Provide provenance for generated binaries.
4951
- name: Generate artifact attestations
5052
if: ${{ inputs.createAttestations == true }}
51-
uses: actions/attest-build-provenance@00014ed6ed5efc5b1ab7f7f34a39eb55d41aa4f8 # v3.1.0
53+
uses: actions/attest@59d89421af93a897026c735860bf21b6eb4f7b26 # v4.1.0
5254
with:
5355
subject-path: |
5456
${{ github.workspace }}/phpcs.phar
5557
${{ github.workspace }}/phpcbf.phar
5658
5759
- name: Upload the PHPCS phar
5860
if: ${{ inputs.uploadArtifacts == true }}
59-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
61+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
6062
with:
6163
name: phpcs-phar
6264
path: ./phpcs.phar
@@ -65,7 +67,7 @@ jobs:
6567

6668
- name: Upload the PHPCBF phar
6769
if: ${{ inputs.uploadArtifacts == true }}
68-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
70+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
6971
with:
7072
name: phpcbf-phar
7173
path: ./phpcbf.phar

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ jobs:
5252
steps:
5353
- name: Checkout code
5454
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
55+
with:
56+
persist-credentials: false
5557

5658
- name: Install PHP
5759
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
@@ -94,6 +96,8 @@ jobs:
9496
steps:
9597
- name: Checkout code
9698
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
99+
with:
100+
persist-credentials: false
97101

98102
- name: Install PHP
99103
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
@@ -127,6 +131,8 @@ jobs:
127131
steps:
128132
- name: Checkout code
129133
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
134+
with:
135+
persist-credentials: false
130136

131137
- name: Install PHP
132138
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
@@ -194,6 +200,8 @@ jobs:
194200
steps:
195201
- name: Checkout code
196202
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
203+
with:
204+
persist-credentials: false
197205

198206
- name: Install PHP
199207
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0

‎.github/workflows/test.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ jobs:
105105
run: git config --global core.autocrlf input
106106

107107
- name: Checkout code
108-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
108+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
109+
with:
110+
persist-credentials: false
109111

110112
- name: "libxml2: find the latest relevant tag"
111113
if: ${{ matrix.libxml_minor }}
@@ -129,7 +131,7 @@ jobs:
129131
- name: "libxml2: restore cache"
130132
if: ${{ matrix.libxml_minor }}
131133
id: libxml_cache_restore
132-
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
134+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
133135
with:
134136
path: "libxml2-${{ steps.libxml_patch_version.outputs.PATCH }}"
135137
key: "${{ matrix.os }}-libxml-${{ matrix.libxml_minor }}-${{ steps.libxml_patch_version.outputs.PATCH }}"
@@ -157,7 +159,7 @@ jobs:
157159
- name: "libxml2: save cache"
158160
if: ${{ matrix.libxml_minor && steps.libxml_cache_restore.outputs.cache-hit != 'true' }}
159161
id: libxml_cache_save
160-
uses: actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
162+
uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
161163
with:
162164
path: "libxml2-${{ steps.libxml_patch_version.outputs.PATCH }}"
163165
key: ${{ steps.libxml_cache_restore.outputs.cache-primary-key }}
@@ -255,7 +257,7 @@ jobs:
255257

256258
- name: Download the PHPCS phar
257259
if: ${{ matrix.custom_ini == false }}
258-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
260+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
259261
with:
260262
name: phpcs-phar
261263

@@ -300,7 +302,9 @@ jobs:
300302
run: git config --global core.autocrlf input
301303

302304
- name: Checkout code
303-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
305+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
306+
with:
307+
persist-credentials: false
304308

305309
- name: Setup ini config
306310
if: ${{ matrix.custom_ini == true && matrix.os != 'windows-latest' }}

0 commit comments

Comments
 (0)