Merge branch '3.x' into 4.x

Author: jrfnl

.github/workflows/build-phar.yml

@@ -45,7 +45,7 @@ jobs:
     strategy:
       matrix:
         # Deliberately missing PHP 8.0 as that PHAR is build and used in the test workflow.
-        php: ['7.2', '7.3', '7.4', '8.1', '8.2', '8.3', '8.4', 'nightly']
+        php: ['7.2', '7.3', '7.4', '8.1', '8.2', '8.3', '8.4', '8.5', 'nightly']
 
     name: "Build Phar on PHP: ${{ matrix.php }}"
 

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

@@ -27,12 +27,12 @@ jobs:
 
     strategy:
       matrix:
-        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
+        php: ['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

.github/workflows/test.yml

@@ -54,14 +54,14 @@ jobs:
       #   code conditions.
       matrix:
         os: ['ubuntu-latest', 'windows-latest']
-        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5', '8.6']
         custom_ini: [false]
 
         include:
           # Skip test runs on builds which are also run in the coverage job.
           - php: '7.2'
             skip_tests: true
-          - php: '8.4'
+          - php: '8.5'
             skip_tests: true
 
           # Run a couple of builds with custom extensions to allow for testing ini handling within PHPCS.
@@ -88,20 +88,17 @@ jobs:
           - php: '7.4'
             os: 'ubuntu-latest'
             custom_ini: true
-          - php: '8.3'
-            os: 'ubuntu-latest'
-            custom_ini: true
-          - php: '8.0'
+          - php: '8.1'
             os: 'ubuntu-latest'
             custom_ini: true
-          - php: '8.2'
+          - php: '8.3'
             os: 'ubuntu-latest'
             custom_ini: true
 
     # 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
@@ -204,7 +201,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: Grab PHPUnit version
@@ -236,14 +233,14 @@ jobs:
         run: php "vendor/bin/phpunit" -c ${{ steps.phpunit_config.outputs.FILE }} --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" -c ${{ steps.phpunit_config.outputs.FILE }} --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" -c ${{ steps.phpunit_config.outputs.FILE }} --no-coverage
           --group CBF --exclude-group nothing
@@ -275,22 +272,22 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest', 'windows-latest']
-        # Note: we can only run code coverage builds against PHP 7.2 and PHP 8.4 or higher:
+        # Note: we can only run code coverage builds against PHP 7.2 and PHP 8.5 or higher:
         # - PHP 7.2 will work as it uses PHPUnit 8, which doesn't use PHP Parser yet.
         # - As of PHPUnit 9.3 (PHP 7.3+), PHPUnit started using PHP Parser for code coverage, and PHP Parser
         #   also polyfills tokens, but to different (integer) values.
         # - Additionally, PHP Parser will block PHPUnit from running with a fatal error if it detects
         #   non-integer values for polyfilled tokens.... _sigh_.
         # - So, aside from PHP 7.2, we can only run code coverage on the last PHP version (or higher)
         #   which added a new token, which is polyfilled by both.
-        #   At the time of writing, this means PHP 8.4 or higher.
-        php: ['7.2', '8.4']
+        #   At the time of writing, this means PHP 8.5 or higher.
+        php: ['7.2', '8.5']
         custom_ini: [false]
 
         include:
           # Also run one coverage build with custom ini settings for testing the DisallowShortOpenTag sniff.
           # Also run with a disabled extension for testing the handling of unsettable ini settings by PHPCS.
-          - php: '8.4'
+          - php: '8.5'
             os: 'ubuntu-latest'
             custom_ini: true
             extensions: ':mysqli' # Run with mysqli disabled.

README.md

@@ -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 7.2 to 8.4](https://img.shields.io/badge/tested%20on-PHP%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 7.2 to 8.5](https://img.shields.io/badge/tested%20on-PHP%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