Merge pull request #746 from PHPCSStandards/develop

jrfnl · web-flow · commit c216317e96c8 · 2025-12-08T15:27:58.000+01:00
Release 1.2.2
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,7 +8,8 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "cron"
+      cronjob: "10 22 5,20 * *" # At 22:10, every 5th and 20th day of the month.
     open-pull-requests-limit: 5
     commit-message:
       prefix: "GH Actions:"
diff --git a/.github/workflows/basics.yml b/.github/workflows/basics.yml
@@ -26,12 +26,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
 
       - name: Install PHP
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # 2.35.5
+        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
         with:
           php-version: 'latest'
           coverage: none
diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
@@ -50,7 +50,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
 
@@ -66,7 +66,7 @@ jobs:
           fi
 
       - name: Install PHP
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # 2.35.5
+        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
         with:
           php-version: ${{ matrix.php }}
           ini-values: ${{ steps.set_ini.outputs.PHP_INI }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,20 +30,20 @@ jobs:
 
     strategy:
       matrix:
-        php: ['5.4', '7.0', '7.4', '8.0', '8.4', '8.5']
+        php: ['5.4', '7.0', '7.4', '8.0', '8.5', 'nightly']
 
     name: "Lint: PHP ${{ matrix.php }}"
 
-    continue-on-error: ${{ matrix.php == '8.5' }}
+    continue-on-error: ${{ matrix.php == 'nightly' }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
 
       - name: Install PHP
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # 2.35.5
+        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
         with:
           php-version: ${{ matrix.php }}
           ini-file: 'development'
@@ -54,16 +54,16 @@ jobs:
         uses: "ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520" # 3.1.1
         with:
           # For PHP "nightly", we need to install with ignore platform reqs as not all dependencies may allow it yet.
-          composer-options: ${{ matrix.php == '8.5' && '--ignore-platform-req=php+' || '' }}
+          composer-options: ${{ matrix.php == 'nightly' && '--ignore-platform-req=php+' || '' }}
           # Bust the cache at least once a month - output format: YYYY-MM.
           custom-cache-suffix: $(date -u "+%Y-%m")
 
       - name: "Lint against parse errors (PHP < 7.2)"
-        if: ${{ matrix.php < 7.2 }}
+        if: ${{ matrix.php < 7.2 && matrix.php != 'nightly' }}
         run: composer lint-lt72 -- --checkstyle | cs2pr
 
       - name: "Lint against parse errors (PHP 7.2+)"
-        if: ${{ matrix.php >= 7.2 }}
+        if: ${{ matrix.php >= 7.2 || matrix.php == 'nightly' }}
         run: composer lint -- --checkstyle | cs2pr
 
 
@@ -86,7 +86,7 @@ jobs:
         # IMPORTANT: test runs shouldn't fail because of PHPCS being incompatible with a PHP version.
         #
         # The matrix is set up so as not to duplicate the builds which are run for code coverage.
-        php: ['5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php: ['5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
         phpcs_version: ['lowest', '3.x-dev', '4.0.1', '4.x-dev']
         risky: [false]
         experimental: [false]
@@ -127,11 +127,11 @@ jobs:
             extensions: ':iconv' # Run with iconv disabled.
 
           # Experimental builds. These are allowed to fail.
-          - php: '8.5'
+          - php: '8.6'
             phpcs_version: '3.x-dev'
             risky: false
             experimental: true
-          - php: '8.5'
+          - php: '8.6'
             phpcs_version: '4.x-dev'
             risky: false
             experimental: true
@@ -152,22 +152,22 @@ jobs:
             risky: true
             experimental: true
 
-          - php: '8.4'
+          - php: '8.5'
             phpcs_version: 'lowest'
             risky: true
             experimental: true
 
-          - php: '8.4'
+          - php: '8.5'
             phpcs_version: '3.x-dev'
             risky: true
             experimental: true
 
-          - php: '8.4'
+          - php: '8.5'
             phpcs_version: '4.0.1'
             risky: true
             experimental: true
 
-          - php: '8.4'
+          - php: '8.5'
             phpcs_version: '4.x-dev'
             risky: true
             experimental: true
@@ -178,7 +178,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
 
@@ -194,7 +194,7 @@ jobs:
           fi
 
       - name: Install PHP
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # 2.35.5
+        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
         with:
           php-version: ${{ matrix.php }}
           extensions: ${{ matrix.extensions }}
@@ -219,7 +219,7 @@ jobs:
         uses: "ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520" # 3.1.1
         with:
           # For PHP "nightly", we need to install with ignore platform reqs as not all dependencies may allow it yet.
-          composer-options: ${{ matrix.php == '8.5' && '--ignore-platform-req=php+' || '' }}
+          composer-options: ${{ matrix.php == '8.6' && '--ignore-platform-req=php+' || '' }}
           # Bust the cache at least once a month - output format: YYYY-MM.
           custom-cache-suffix: $(date -u "+%Y-%m")
 
@@ -295,14 +295,14 @@ jobs:
     strategy:
       matrix:
         include:
-          - php: '8.4'
+          - php: '8.5'
             phpcs_version: '4.x-dev'
             extensions: ':iconv' # Run one build with iconv disabled.
-          - php: '8.4'
+          - php: '8.5'
             phpcs_version: '4.0.1'
-          - php: '8.4'
+          - php: '8.5'
             phpcs_version: '3.x-dev'
-          - php: '8.4'
+          - php: '8.5'
             phpcs_version: 'lowest'
           - php: '7.2'
             phpcs_version: '4.x-dev'
@@ -317,7 +317,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
 
@@ -333,7 +333,7 @@ jobs:
           fi
 
       - name: Install PHP
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # 2.35.5
+        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
         with:
           php-version: ${{ matrix.php }}
           extensions: ${{ matrix.extensions }}
@@ -398,7 +398,7 @@ jobs:
 
       - name: Upload coverage results to Coveralls
         if: ${{ success() }}
-        uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2.3.6
+        uses: coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e # v2.3.7
         with:
           format: clover
           file: build/logs/clover.xml
@@ -415,6 +415,6 @@ jobs:
 
     steps:
       - name: Coveralls Finished
-        uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2.3.6
+        uses: coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e # v2.3.7
         with:
           parallel-finished: true
diff --git a/.github/workflows/update-docs.yml b/.github/workflows/update-docs.yml
@@ -58,18 +58,18 @@ jobs:
           fi
 
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           ref: ${{ steps.base_branch.outputs.BRANCH }}
           # fetch-depth is needed to allow for retrieving the last tag for a non-tag workflow run.
           fetch-depth: 0
           persist-credentials: false
 
       - name: Install PHP
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # 2.35.5
+        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
         with:
           # Use a version known to be safe for last phpDocumentor release.
-          php-version: '8.1'
+          php-version: '8.4'
           ini-file: 'development'
           coverage: none
           # Install the latest phpDocumentor release as a PHAR.
diff --git a/.github/workflows/update-phpcs-versionnr.yml b/.github/workflows/update-phpcs-versionnr.yml
@@ -52,7 +52,7 @@ jobs:
           echo "PR_BRANCH=feature/getversiontest-update-phpcs-version" >> "$GITHUB_OUTPUT"
 
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           ref: ${{ steps.branches.outputs.BASE }}
           persist-credentials: false
@@ -79,7 +79,7 @@ jobs:
         run: git status -vv --untracked=all
 
       - name: Create pull request
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
+        uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676 # v7.0.11
         with:
           base: ${{ steps.branches.outputs.BASE }}
           branch: ${{ steps.branches.outputs.PR_BRANCH }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,13 +10,35 @@ This projects adheres to [Keep a CHANGELOG](https://keepachangelog.com/) and use
 _Nothing yet._
 
 
+## [1.2.2] - 2025-12-08
+
+### Added
+
+#### PHPCS Backcompat
+
+* `BCTokens::castTokens()`: sync with PHPCS 4.0.2 - added the `T_VOID_CAST` token (when available). [#742]
+
+### Changed
+
+#### Utils
+
+* `FunctionDeclarations::getProperties()`: more defensive coding against parse errors/live coding. [#740]
+
+#### Other
+
+* Various housekeeping.
+
+[#740]: https://github.com/PHPCSStandards/PHPCSUtils/pull/740
+[#742]: https://github.com/PHPCSStandards/PHPCSUtils/pull/742
+
+
 ## [1.2.1] - 2025-11-17
 
 ### Fixed
 
 #### Abstract Sniffs
 
-* The `AbstractArrayDeclarationSniff::getActualArrayKey()` method could cause deprecation notices and even fatal errors, when a PHPCS scan would be run on a different PHP version than the "code under scan" is targetting and the "code under scan" contained deprecated/removed type casts. [#733]
+* The `AbstractArrayDeclarationSniff::getActualArrayKey()` method could cause deprecation notices and even fatal errors, when a PHPCS scan would be run on a different PHP version than the "code under scan" is targeting and the "code under scan" contained deprecated/removed type casts. [#733]
 
 [#733]: https://github.com/PHPCSStandards/PHPCSUtils/pull/733
 
@@ -1333,6 +1355,7 @@ This initial alpha release contains the following utility classes:
 
 
 [Unreleased]:   https://github.com/PHPCSStandards/PHPCSUtils/compare/stable...HEAD
+[1.2.2]:        https://github.com/PHPCSStandards/PHPCSUtils/compare/1.2.1...1.2.2
 [1.2.1]:        https://github.com/PHPCSStandards/PHPCSUtils/compare/1.2.0...1.2.1
 [1.2.0]:        https://github.com/PHPCSStandards/PHPCSUtils/compare/1.1.3...1.2.0
 [1.1.3]:        https://github.com/PHPCSStandards/PHPCSUtils/compare/1.1.2...1.1.3
diff --git a/PHPCSUtils/BackCompat/BCTokens.php b/PHPCSUtils/BackCompat/BCTokens.php
@@ -46,7 +46,6 @@
  * @method static array<int|string, int|string> arithmeticTokens()         Tokens that represent arithmetic operators.
  * @method static array<int|string, int|string> booleanOperators()         Tokens that perform boolean operations.
  * @method static array<int|string, int|string> bracketTokens()            Tokens that represent brackets and parenthesis.
- * @method static array<int|string, int|string> castTokens()               Tokens that represent type casting.
  * @method static array<int|string, int|string> commentTokens()            Tokens that are comments.
  * @method static array<int|string, int|string> comparisonTokens()         Tokens that represent comparison operator.
  * @method static array<int|string, int|string> contextSensitiveKeywords() Tokens representing context sensitive keywords
@@ -144,6 +143,31 @@ public static function blockOpeners()
         return $tokens;
     }
 
+    /**
+     * Tokens that represent casting.
+     *
+     * Retrieve the PHPCS cast tokens array in a cross-version compatible manner.
+     *
+     * Changelog for the PHPCS native array:
+     * - PHPCS 4.0.2: The PHP 8.5 T_VOID_CAST token was added.
+     *
+     * @see \PHP_CodeSniffer\Util\Tokens::$castTokens Original array.
+     *
+     * @since 1.2.1
+     *
+     * @return array<int|string, int|string> Token array.
+     */
+    public static function castTokens()
+    {
+        $tokens = Tokens::$castTokens;
+
+        if (\defined('T_VOID_CAST')) {
+            $tokens[\T_VOID_CAST] = \T_VOID_CAST;
+        }
+
+        return $tokens;
+    }
+
     /**
      * Tokens that represent the names of called functions.
      *
diff --git a/PHPCSUtils/Utils/FunctionDeclarations.php b/PHPCSUtils/Utils/FunctionDeclarations.php
@@ -150,6 +150,7 @@ public static function getName(File $phpcsFile, $stackPtr)
      *   - `"has_body"` index could be set to `true` for functions without body in the case of
      *      parse errors or live coding.
      * - Defensive coding against incorrect calls to this method.
+     * - Defensive coding against incorrect results due to parse errors in the code under scan.
      * - More efficient checking whether a function has a body.
      * - Support for PHP 8.0 identifier name tokens in return types, cross-version PHP & PHPCS.
      * - The results of this function call are cached during a PHPCS run for faster response times.
@@ -277,7 +278,10 @@ public static function getProperties(File $phpcsFile, $stackPtr)
                     break;
                 }
 
-                if ($scopeOpener === null && $tokens[$i]['code'] === \T_SEMICOLON) {
+                if ($scopeOpener === null
+                    && ($tokens[$i]['code'] === \T_SEMICOLON
+                    || $tokens[$i]['code'] === \T_OPEN_CURLY_BRACKET)
+                ) {
                     // End of abstract/interface function definition.
                     break;
                 }
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@
 [![Coverage Status](https://coveralls.io/repos/github/PHPCSStandards/PHPCSUtils/badge.svg?branch=develop)](https://coveralls.io/github/PHPCSStandards/PHPCSUtils?branch=develop)
 
 [![Minimum PHP Version](https://img.shields.io/packagist/dependency-v/phpcsstandards/phpcsutils/php.svg)][phpcsutils-packagist]
-[![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)][phpcsutils-tests-gha]
+[![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)][phpcsutils-tests-gha]
 
 [![License: LGPLv3](https://img.shields.io/github/license/PHPCSStandards/PHPCSUtils)](https://github.com/PHPCSStandards/PHPCSUtils/blob/stable/LICENSE)
 ![Awesome](https://img.shields.io/badge/awesome%3F-yes!-brightgreen.svg)
diff --git a/Tests/BackCompat/BCTokens/CastTokensTest.php b/Tests/BackCompat/BCTokens/CastTokensTest.php
diff --git a/Tests/BackCompat/BCTokens/UnchangedTokenArraysTest.php b/Tests/BackCompat/BCTokens/UnchangedTokenArraysTest.php
diff --git a/Tests/Utils/FunctionDeclarations/GetPropertiesDiffTest.inc b/Tests/Utils/FunctionDeclarations/GetPropertiesDiffTest.inc
diff --git a/Tests/Utils/FunctionDeclarations/GetPropertiesDiffTest.php b/Tests/Utils/FunctionDeclarations/GetPropertiesDiffTest.php
