Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-phar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
strategy:
matrix:
# Deliberately missing PHP 8.0 as that PHAR is build and used in the test workflow.
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']
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']

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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/end-to-end-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ jobs:

strategy:
matrix:
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']
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']

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

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

steps:
- name: Prepare git to leave line endings alone
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
# code conditions.
matrix:
os: ['ubuntu-latest', 'windows-latest']
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']
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']
custom_ini: [false]

exclude:
Expand All @@ -76,7 +76,7 @@ jobs:
- php: '5.5'
os: 'windows-latest'
skip_tests: true
- php: '8.4'
- php: '8.5'
skip_tests: true

# The default libxml library on Ubuntu images is a little out of date.
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
# yamllint disable-line rule:line-length
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' }})"

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

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

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

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

- name: 'PHPUnit: run select tests in CBF mode'
if: ${{ matrix.skip_tests != true && matrix.php != '8.3' }}
if: ${{ matrix.skip_tests != true && matrix.php != '8.4' }}
run: php "vendor/bin/phpunit" tests/AllTests.php --group CBF --exclude-group nothing --no-coverage
env:
PHP_CODESNIFFER_CBF: '1'
Expand Down Expand Up @@ -274,7 +274,7 @@ jobs:
strategy:
matrix:
os: ['ubuntu-latest', 'windows-latest']
php: ['8.4']
php: ['8.5']
custom_ini: [false]

include:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[![License](https://img.shields.io/github/license/PHPCSStandards/PHP_CodeSniffer)](https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/HEAD/licence.txt)

![Minimum PHP Version](https://img.shields.io/packagist/dependency-v/squizlabs/php_codesniffer/php.svg)
[![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]
[![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]

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

Expand Down