Skip to content

Commit 77a4a01

Browse files
committed
GH Actions: update for the release of PHP 8.5
... which is expected to be released this Thursday. * Builds against PHP 8.5 are no longer allowed to fail. * Update PHP version on which code coverage is run (high should now be 8.5). * Add _allowed to fail_ build against PHP 8.6. * Update "tested against" badge in the README. Note: for some workflows I use "nightly" for the "next" PHP version, for some `8.6`. While it may appear there is no difference and this is true for the better part of the year, there is a difference for about two months. To illustrate, consider PHP 8.5: * PHP "nightly" refers to the PHP `master` branch, so was PHP 8.5 until the PHP 8.5 was branched off when the first RC was cut in September. * As of that moment, "nightly" basically became PHP 8.6, so to test against PHP 8.5, one would need to explicitly request `8.5`. * As of the release of PHP 8.5, it is expected for "nightly" to be PHP 8.6, so the difference is moot again. For that reason, the unit test workflow uses the explicit `8.6` version for PHP "next".
1 parent ddac4e1 commit 77a4a01

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

.github/workflows/build-phar.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
strategy:
4444
matrix:
4545
# Deliberately missing PHP 8.0 as that PHAR is build and used in the test workflow.
46-
php: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.1', '8.2', '8.3', '8.4', 'nightly']
46+
php: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.1', '8.2', '8.3', '8.4', '8.5', 'nightly']
4747

4848
name: "Build Phar on PHP: ${{ matrix.php }}"
4949

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

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

2828
strategy:
2929
matrix:
30-
php: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
30+
php: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5', 'nightly']
3131

3232
# yamllint disable-line rule:line-length
3333
name: "E2E PHP: ${{ matrix.php }}"
3434

35-
continue-on-error: ${{ matrix.php == '8.5' }}
35+
continue-on-error: ${{ matrix.php == 'nightly' }}
3636

3737
steps:
3838
- name: Prepare git to leave line endings alone

.github/workflows/test.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
# code conditions.
5555
matrix:
5656
os: ['ubuntu-latest', 'windows-latest']
57-
php: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
57+
php: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5', '8.6']
5858
custom_ini: [false]
5959

6060
exclude:
@@ -76,7 +76,7 @@ jobs:
7676
- php: '5.5'
7777
os: 'windows-latest'
7878
skip_tests: true
79-
- php: '8.4'
79+
- php: '8.5'
8080
skip_tests: true
8181

8282
# The default libxml library on Ubuntu images is a little out of date.
@@ -107,7 +107,7 @@ jobs:
107107
# yamllint disable-line rule:line-length
108108
name: "PHP: ${{ matrix.php }} ${{ matrix.custom_ini && ' with custom ini settings' || '' }}${{ matrix.libxml_minor && format( ' with libxml {0}', matrix.libxml_minor ) || '' }} (${{ matrix.os == 'ubuntu-latest' && 'Linux' || 'Win' }})"
109109

110-
continue-on-error: ${{ matrix.php == '8.5' }}
110+
continue-on-error: ${{ matrix.php == '8.6' }}
111111

112112
steps:
113113
- name: Prepare git to leave line endings alone
@@ -226,7 +226,7 @@ jobs:
226226
- name: Install Composer dependencies
227227
uses: "ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520" # 3.1.1
228228
with:
229-
composer-options: ${{ matrix.php == '8.5' && '--ignore-platform-req=php+' || '' }}
229+
composer-options: ${{ matrix.php == '8.6' && '--ignore-platform-req=php+' || '' }}
230230
custom-cache-suffix: $(date -u "+%Y-%m")
231231

232232
- name: 'PHPCS: set the path to PHP'
@@ -237,14 +237,14 @@ jobs:
237237
run: php "vendor/bin/phpunit" tests/AllTests.php --no-coverage
238238

239239
# Do one test run against the complete test suite in CBF mode to ensure all tests can run in CBF mode.
240-
- name: 'PHPUnit: run the full test suite without code coverage in CBF mode (PHP 8.3 only)'
241-
if: ${{ matrix.php == '8.3' }}
240+
- name: 'PHPUnit: run the full test suite without code coverage in CBF mode (PHP 8.4 only)'
241+
if: ${{ matrix.php == '8.4' }}
242242
run: php "vendor/bin/phpunit" tests/AllTests.php --exclude-group nothing --no-coverage
243243
env:
244244
PHP_CODESNIFFER_CBF: '1'
245245

246246
- name: 'PHPUnit: run select tests in CBF mode'
247-
if: ${{ matrix.skip_tests != true && matrix.php != '8.3' }}
247+
if: ${{ matrix.skip_tests != true && matrix.php != '8.4' }}
248248
run: php "vendor/bin/phpunit" tests/AllTests.php --group CBF --exclude-group nothing --no-coverage
249249
env:
250250
PHP_CODESNIFFER_CBF: '1'
@@ -274,7 +274,7 @@ jobs:
274274
strategy:
275275
matrix:
276276
os: ['ubuntu-latest', 'windows-latest']
277-
php: ['8.4']
277+
php: ['8.5']
278278
custom_ini: [false]
279279

280280
include:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[![License](https://img.shields.io/github/license/PHPCSStandards/PHP_CodeSniffer)](https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/HEAD/licence.txt)
1010

1111
![Minimum PHP Version](https://img.shields.io/packagist/dependency-v/squizlabs/php_codesniffer/php.svg)
12-
[![Tested on PHP 5.4 to 8.4](https://img.shields.io/badge/tested%20on-PHP%205.4%20|%205.5%20|%205.6%20|%207.0%20|%207.1%20|%207.2%20|%207.3%20|%207.4%20|%208.0%20|%208.1%20|%208.2%20|%208.3%20|%208.4-brightgreen.svg?maxAge=2419200)][GHA-test]
12+
[![Tested on PHP 5.4 to 8.5](https://img.shields.io/badge/tested%20on-PHP%205.4%20|%205.5%20|%205.6%20|%207.0%20|%207.1%20|%207.2%20|%207.3%20|%207.4%20|%208.0%20|%208.1%20|%208.2%20|%208.3%20|%208.4%20|%208.5-brightgreen.svg?maxAge=2419200)][GHA-test]
1313

1414
[GHA-test]: https://github.com/PHPCSStandards/PHP_CodeSniffer/actions/workflows/test.yml
1515

0 commit comments

Comments
 (0)