Merge pull request #709 from PHPCSStandards/develop

Release 1.1.2

Author: jrfnl

.github/release-checklist.md

@@ -26,5 +26,6 @@ PR for tracking changes for the x.x.x release. Target release date: **DOW MONTH
 
 ### Publicize
 
+- [ ] Post on Mastodon about the release.
 - [ ] Tweet about the release.
 - [ ] Inform the primary dependants of this repo (PHPCSExtra, WordPressCS, PHPCompatibility and VariableAnalysis) about the release.

.github/workflows/basics.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2

.github/workflows/quicktest.yml

@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       # On stable PHPCS versions, allow for PHP deprecation notices.
       # Unit tests don't need to fail on those for stable releases where those issues won't get fixed anymore.

.github/workflows/test.yml

@@ -25,7 +25,7 @@ env:
 
 jobs:
   lint:
-    if: ${{ github.ref != 'refs/heads/develop' }}
+    if: ${{ github.ref != 'refs/heads/develop' || github.event_name != 'pull_request' }}
     runs-on: ubuntu-latest
 
     strategy:
@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
@@ -67,7 +67,7 @@ jobs:
 
   #### TEST STAGE ####
   test:
-    if: ${{ github.ref != 'refs/heads/develop' }}
+    if: ${{ github.ref != 'refs/heads/develop' || github.event_name != 'pull_request' }}
     needs: lint
     runs-on: ubuntu-latest
 
@@ -161,7 +161,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       # On stable PHPCS versions, allow for PHP deprecation notices.
       # Unit tests don't need to fail on those for stable releases where those issues won't get fixed anymore.
@@ -294,7 +294,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       # On stable PHPCS versions, allow for PHP deprecation notices.
       # Unit tests don't need to fail on those for stable releases where those issues won't get fixed anymore.

.github/workflows/update-docs.yml

@@ -58,7 +58,7 @@ jobs:
           fi
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ steps.base_branch.outputs.BRANCH }}
           # fetch-depth is needed to allow for retrieving the last tag for a non-tag workflow run.
@@ -129,7 +129,7 @@ jobs:
           destination: ./docs/_site
 
       - name: Upload GH Pages artifact
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v4
         with:
           path: ./docs/_site
 

.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@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ steps.branches.outputs.BASE }}
 

CHANGELOG.md

@@ -10,6 +10,43 @@ This projects adheres to [Keep a CHANGELOG](https://keepachangelog.com/) and use
 _Nothing yet._
 
 
+## [1.1.2] - 2025-09-05
+
+### Added
+
+#### PHPCS BackCompat
+
+* `BCFile::getMemberProperties()`: sync with PHPCS 3.13.3 - support for PHP 8.4 abstract properties. [#698]
+
+#### Utils
+
+* `Variables::getMemberProperties()`: support for PHP 8.4 abstract properties. [#698]
+
+### Changed
+
+#### Utils
+
+* `TypeString::normalizeCase()` will now also normalize a fully qualified `true`, `false` or `null` type to unqualified. [#702]
+
+#### Other
+
+* Dropped support for [PHP_CodeSniffer] < 3.13.3. [#698]
+    Please ensure you run `composer update phpcsstandards/phpcsutils --with-dependencies` to benefit from this.
+* Various housekeeping.
+
+### Fixed
+
+#### Utils
+
+* `TypeString::isNullable()`: a type string with a fully qualified `null` was not recognized as nullable. [#702]
+* `TypeString::isKeyword()`: a fully qualified `true`, `false` or `null` type was not recognized as a keyword type. [#702]
+
+_Note: using fully qualified `true`, `false` or `null` in a typestring is not allowed by PHP. Even so, the `TypeString` utility will now handle this in a parse error tolerant manner._
+
+[#698]: https://github.com/PHPCSStandards/PHPCSUtils/pull/698
+[#702]: https://github.com/PHPCSStandards/PHPCSUtils/pull/702
+
+
 ## [1.1.1] - 2025-08-10
 
 ### Changed
@@ -1239,6 +1276,7 @@ This initial alpha release contains the following utility classes:
 
 
 [Unreleased]:   https://github.com/PHPCSStandards/PHPCSUtils/compare/stable...HEAD
+[1.1.2]:        https://github.com/PHPCSStandards/PHPCSUtils/compare/1.1.1...1.1.2
 [1.1.1]:        https://github.com/PHPCSStandards/PHPCSUtils/compare/1.1.0...1.1.1
 [1.1.0]:        https://github.com/PHPCSStandards/PHPCSUtils/compare/1.0.12...1.1.0
 [1.0.12]:       https://github.com/PHPCSStandards/PHPCSUtils/compare/1.0.11...1.0.12

PHPCSUtils/AbstractSniffs/AbstractArrayDeclarationSniff.php

@@ -478,31 +478,15 @@ public function getActualArrayKey(File $phpcsFile, $startPtr, $endPtr)
                 continue;
             }
 
-            // Handle FQN true/false/null.
-            if ($this->tokens[$i]['code'] === \T_NAME_FULLY_QUALIFIED) {
-                $compareReadyKeyword = \strtolower($this->tokens[$i]['content']);
-                if ($compareReadyKeyword === '\true'
-                    || $compareReadyKeyword === '\false'
-                    || $compareReadyKeyword === '\null'
-                ) {
-                    // FQN true/false/null on PHPCS 4.x. This can be handled.
-                    $content .= $this->tokens[$i]['content'];
-                    continue;
-                }
-            } elseif ($this->tokens[$i]['code'] === \T_NS_SEPARATOR) {
-                // PHPCS 3.x.
+            // Handle FQN true/false/null for PHPCS 3.x.
+            if ($this->tokens[$i]['code'] === \T_NS_SEPARATOR) {
                 $nextNonEmpty   = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
                 $nextNonEmptyLC = \strtolower($this->tokens[$nextNonEmpty]['content']);
                 if ($nextNonEmpty !== false
-                    // PHPCS 3.x with PHP < 8.0.
                     && ($this->tokens[$nextNonEmpty]['code'] === \T_TRUE
                     || $this->tokens[$nextNonEmpty]['code'] === \T_FALSE
-                    || $this->tokens[$nextNonEmpty]['code'] === \T_NULL
-                    // PHPCS 3.x with PHP >= 8.0 where the namespaced name tokenization has been undone.
-                    || ($this->tokens[$nextNonEmpty]['code'] === \T_STRING
-                        && ($nextNonEmptyLC === 'true' || $nextNonEmptyLC === 'false' || $nextNonEmptyLC === 'null')))
+                    || $this->tokens[$nextNonEmpty]['code'] === \T_NULL)
                 ) {
-                    // FQN true/false/null on PHPCS 3.x. This can be handled.
                     $content .= $this->tokens[$nextNonEmpty]['content'];
                     $i        = $nextNonEmpty;
                     continue;

PHPCSUtils/BackCompat/BCFile.php

@@ -524,7 +524,7 @@ public static function getMethodParameters(File $phpcsFile, $stackPtr)
      *
      * Changelog for the PHPCS native function:
      * - Introduced in PHPCS 0.0.5.
-     * - The upstream method has received no significant updates since PHPCS 3.13.0.
+     * - The upstream method has received no significant updates since PHPCS 3.13.3.
      *
      * @see \PHP_CodeSniffer\Files\File::getMethodProperties()      Original source.
      * @see \PHPCSUtils\Utils\FunctionDeclarations::getProperties() PHPCSUtils native improved version.
@@ -559,6 +559,7 @@ public static function getMethodProperties(File $phpcsFile, $stackPtr)
      *   'is_static'       => boolean,       // TRUE if the static keyword was found.
      *   'is_readonly'     => boolean,       // TRUE if the readonly keyword was found.
      *   'is_final'        => boolean,       // TRUE if the final keyword was found.
+     *   'is_abstract'     => boolean,       // TRUE if the abstract keyword was found.
      *   'type'            => string,        // The type of the var (empty if no type specified).
      *   'type_token'      => integer|false, // The stack pointer to the start of the type
      *                                       // or FALSE if there is no type.
@@ -573,13 +574,16 @@ public static function getMethodProperties(File $phpcsFile, $stackPtr)
      *
      * Changelog for the PHPCS native function:
      * - Introduced in PHPCS 0.0.5.
+     * - PHPCS 3.13.3: support for PHP 8.4 abstract properties.
      * - PHPCS 4.0: properties in interfaces (PHP 8.4+) are accepted.
      * - PHPCS 4.0: will no longer throw a parse error warning.
      *
      * @see \PHP_CodeSniffer\Files\File::getMemberProperties() Original source.
      * @see \PHPCSUtils\Utils\Variables::getMemberProperties() PHPCSUtils native improved version.
      *
      * @since 1.0.0
+     * @since 1.1.0 Sync with PHPCS 4.0.0, remove parse error warning and support PHP 8.4 properties in interfaces. PHPCS(new)#991
+     * @since 1.1.2 Sync with PHPCS 3.13.3, support for abstract properties. PHPCS(new)#xxx
      *
      * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
      * @param int                         $stackPtr  The position in the stack of the `T_VARIABLE` token to
@@ -626,6 +630,7 @@ public static function getMemberProperties(File $phpcsFile, $stackPtr)
             T_VAR      => T_VAR,
             T_READONLY => T_READONLY,
             T_FINAL    => T_FINAL,
+            T_ABSTRACT => T_ABSTRACT,
         ];
 
         $valid += Tokens::$scopeModifiers;
@@ -637,6 +642,7 @@ public static function getMemberProperties(File $phpcsFile, $stackPtr)
         $isStatic       = false;
         $isReadonly     = false;
         $isFinal        = false;
+        $isAbstract     = false;
 
         $startOfStatement = $phpcsFile->findPrevious(
             [
@@ -684,6 +690,9 @@ public static function getMemberProperties(File $phpcsFile, $stackPtr)
                 case T_FINAL:
                     $isFinal = true;
                     break;
+                case T_ABSTRACT:
+                    $isAbstract = true;
+                    break;
             }
         }
 
@@ -728,6 +737,7 @@ public static function getMemberProperties(File $phpcsFile, $stackPtr)
             'is_static'       => $isStatic,
             'is_readonly'     => $isReadonly,
             'is_final'        => $isFinal,
+            'is_abstract'     => $isAbstract,
             'type'            => $type,
             'type_token'      => $typeToken,
             'type_end_token'  => $typeEndToken,
@@ -751,7 +761,7 @@ public static function getMemberProperties(File $phpcsFile, $stackPtr)
      *
      * Changelog for the PHPCS native function:
      * - Introduced in PHPCS 1.3.0.
-     * - The upstream method has received no significant updates since PHPCS 3.13.0.
+     * - The upstream method has received no significant updates since PHPCS 3.13.3.
      *
      * @see \PHP_CodeSniffer\Files\File::getClassProperties()          Original source.
      * @see \PHPCSUtils\Utils\ObjectDeclarations::getClassProperties() PHPCSUtils native improved version.
@@ -779,7 +789,7 @@ public static function getClassProperties(File $phpcsFile, $stackPtr)
      *
      * Changelog for the PHPCS native function:
      * - Introduced in PHPCS 0.0.5.
-     * - The upstream method has received no significant updates since PHPCS 3.13.0.
+     * - The upstream method has received no significant updates since PHPCS 3.13.3.
      *
      * @see \PHP_CodeSniffer\Files\File::isReference() Original source.
      * @see \PHPCSUtils\Utils\Operators::isReference() PHPCSUtils native improved version.
@@ -805,7 +815,7 @@ public static function isReference(File $phpcsFile, $stackPtr)
      *
      * Changelog for the PHPCS native function:
      * - Introduced in PHPCS 0.0.5.
-     * - The upstream method has received no significant updates since PHPCS 3.13.0.
+     * - The upstream method has received no significant updates since PHPCS 3.13.3.
      *
      * @see \PHP_CodeSniffer\Files\File::getTokensAsString() Original source.
      * @see \PHPCSUtils\Utils\GetTokensAsString              Related set of functions.
@@ -834,7 +844,7 @@ public static function getTokensAsString(File $phpcsFile, $start, $length, $orig
      *
      * Changelog for the PHPCS native function:
      * - Introduced in PHPCS 2.1.0.
-     * - The upstream method has received no significant updates since PHPCS 3.13.0.
+     * - The upstream method has received no significant updates since PHPCS 3.13.3.
      *
      * @see \PHP_CodeSniffer\Files\File::findStartOfStatement() Original source.
      *
@@ -858,7 +868,7 @@ public static function findStartOfStatement(File $phpcsFile, $start, $ignore = n
      *
      * Changelog for the PHPCS native function:
      * - Introduced in PHPCS 2.1.0.
-     * - The upstream method has received no significant updates since PHPCS 3.13.0.
+     * - The upstream method has received no significant updates since PHPCS 3.13.3.
      *
      * @see \PHP_CodeSniffer\Files\File::findEndOfStatement() Original source.
      *
@@ -882,7 +892,7 @@ public static function findEndOfStatement(File $phpcsFile, $start, $ignore = nul
      *
      * Changelog for the PHPCS native function:
      * - Introduced in PHPCS 0.0.5.
-     * - The upstream method has received no significant updates since PHPCS 3.13.0.
+     * - The upstream method has received no significant updates since PHPCS 3.13.3.
      *
      * @see \PHP_CodeSniffer\Files\File::hasCondition()  Original source.
      * @see \PHPCSUtils\Utils\Conditions::hasCondition() PHPCSUtils native alternative.
@@ -907,7 +917,7 @@ public static function hasCondition(File $phpcsFile, $stackPtr, $types)
      *
      * Changelog for the PHPCS native function:
      * - Introduced in PHPCS 1.3.0.
-     * - The upstream method has received no significant updates since PHPCS 3.13.0.
+     * - The upstream method has received no significant updates since PHPCS 3.13.3.
      *
      * @see \PHP_CodeSniffer\Files\File::getCondition()  Original source.
      * @see \PHPCSUtils\Utils\Conditions::getCondition() More versatile alternative.

PHPCSUtils/BackCompat/BCTokens.php

@@ -72,7 +72,7 @@ final class BCTokens
 
     /**
      * Handle calls to (undeclared) methods for token arrays which haven't received any
-     * changes since PHPCS 3.13.0.
+     * changes since PHPCS 3.13.3.
      *
      * @since 1.0.0
      *