Update to PHPCS 4

mmoll · mmoll · commit 989550e85baf · 2025-08-20T15:00:26.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,16 +7,14 @@ jobs:
     strategy:
       matrix:
         php_version:
-          - 5.6
-          - 7.0
-          - 7.1
           - 7.2
           - 7.3
           - 7.4
           - 8.0
           - 8.1
           - 8.2
           - 8.3
+          - 8.4
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
diff --git a/Symfony/Sniffs/Commenting/ClassCommentSniff.php b/Symfony/Sniffs/Commenting/ClassCommentSniff.php
@@ -46,7 +46,7 @@ class ClassCommentSniff extends Sniff
      *
      * @var array
      */
-    protected $tags = array(
+    protected const EXPECTED_TAGS = array(
         'category' => array(
             'required' => false,
             'allow_multiple' => false,
diff --git a/Symfony/Sniffs/Errors/UserDeprecatedSniff.php b/Symfony/Sniffs/Errors/UserDeprecatedSniff.php
@@ -38,6 +38,7 @@ public function register()
     {
         return array(
             T_STRING,
+            T_NAME_FULLY_QUALIFIED,
         );
     }
 
@@ -58,7 +59,9 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
-        if ($tokens[$stackPtr]['content'] !== 'trigger_error') {
+        if ($tokens[$stackPtr]['content'] !== 'trigger_error'
+            && $tokens[$stackPtr]['content'] !== '\trigger_error'
+        ) {
             return;
         }
 
diff --git a/Symfony/Sniffs/Objects/ObjectInstantiationSniff.php b/Symfony/Sniffs/Objects/ObjectInstantiationSniff.php
@@ -69,6 +69,8 @@ public function process(File $phpcsFile, $stackPtr)
         $allowed = array(
             T_STRING,
             T_NS_SEPARATOR,
+            T_NAME_FULLY_QUALIFIED,
+            T_NAME_QUALIFIED,
             T_VARIABLE,
             T_STATIC,
             T_SELF,
diff --git a/Symfony/Sniffs/Whitespace/AssignmentSpacingSniff.php b/Symfony/Sniffs/Whitespace/AssignmentSpacingSniff.php
@@ -49,7 +49,7 @@ class AssignmentSpacingSniff implements Sniff
      */
     public function register()
     {
-        return Tokens::$assignmentTokens;
+        return Tokens::ASSIGNMENT_TOKENS;
 
     }
 
diff --git a/Symfony/Sniffs/Whitespace/BinaryOperatorSpacingSniff.php b/Symfony/Sniffs/Whitespace/BinaryOperatorSpacingSniff.php
@@ -49,7 +49,7 @@ class BinaryOperatorSpacingSniff implements Sniff
      */
     public function register()
     {
-        return Tokens::$comparisonTokens;
+        return Tokens::COMPARISON_TOKENS;
 
     }
 
diff --git a/Symfony/Tests/Arrays/MultiLineArrayCommaUnitTest.php b/Symfony/Tests/Arrays/MultiLineArrayCommaUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace Symfony\Tests\Arrays;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;
 
 /**
  * Unit test class for the MultiLineArrayComma sniff.
@@ -30,7 +30,7 @@
  * @license  http://spdx.org/licenses/MIT MIT License
  * @link     https://github.com/djoos/Symfony2-coding-standard
  */
-class MultiLineArrayCommaUnitTest extends AbstractSniffUnitTest
+class MultiLineArrayCommaUnitTest extends AbstractSniffTestCase
 {
     /**
      * Returns the lines where errors should occur.
diff --git a/Symfony/Tests/Classes/MultipleClassesOneFileUnitTest.php b/Symfony/Tests/Classes/MultipleClassesOneFileUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace Symfony\Tests\Classes;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;
 
 /**
  * Unit test class for the MultipleClassesOneFileUnitTest sniff.
@@ -30,7 +30,7 @@
  * @license  http://spdx.org/licenses/MIT MIT License
  * @link     https://github.com/djoos/Symfony2-coding-standard
  */
-class MultipleClassesOneFileUnitTest extends AbstractSniffUnitTest
+class MultipleClassesOneFileUnitTest extends AbstractSniffTestCase
 {
     /**
      * Returns the lines where errors should occur.
diff --git a/Symfony/Tests/Classes/PropertyDeclarationUnitTest.php b/Symfony/Tests/Classes/PropertyDeclarationUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace Symfony\Tests\Classes;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;
 
 /**
  * Unit test class for the PropertyDeclarationUnitTest sniff.
@@ -30,7 +30,7 @@
  * @license  http://spdx.org/licenses/MIT MIT License
  * @link     https://github.com/djoos/Symfony2-coding-standard
  */
-class PropertyDeclarationUnitTest extends AbstractSniffUnitTest
+class PropertyDeclarationUnitTest extends AbstractSniffTestCase
 {
     /**
      * Returns the lines where errors should occur.
diff --git a/Symfony/Tests/Commenting/AnnotationsUnitTest.php b/Symfony/Tests/Commenting/AnnotationsUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace Symfony\Tests\Commenting;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;
 
 /**
  * Unit test class for the AnnotationsUnitTest sniff.
@@ -30,7 +30,7 @@
  * @license  http://spdx.org/licenses/MIT MIT License
  * @link     https://github.com/djoos/Symfony2-coding-standard
  */
-class AnnotationsUnitTest extends AbstractSniffUnitTest
+class AnnotationsUnitTest extends AbstractSniffTestCase
 {
     /**
      * Returns the lines where errors should occur.
diff --git a/Symfony/Tests/Commenting/ClassCommentUnitTest.php b/Symfony/Tests/Commenting/ClassCommentUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace Symfony\Tests\Commenting;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;
 
 /**
  * Unit test class for the ClassCommentUnitTest sniff.
@@ -30,7 +30,7 @@
  * @license  http://spdx.org/licenses/MIT MIT License
  * @link     https://github.com/djoos/Symfony2-coding-standard
  */
-class ClassCommentUnitTest extends AbstractSniffUnitTest
+class ClassCommentUnitTest extends AbstractSniffTestCase
 {
     /**
      * Returns the lines where errors should occur.
diff --git a/Symfony/Tests/Commenting/FunctionCommentUnitTest.php b/Symfony/Tests/Commenting/FunctionCommentUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace Symfony\Tests\Commenting;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;
 
 /**
  * Unit test class for the FunctionComment sniff.
@@ -30,7 +30,7 @@
  * @license  http://spdx.org/licenses/MIT MIT License
  * @link     https://github.com/djoos/Symfony2-coding-standard
  */
-class FunctionCommentUnitTest extends AbstractSniffUnitTest
+class FunctionCommentUnitTest extends AbstractSniffTestCase
 {
     /**
      * Returns the lines where errors should occur.
diff --git a/Symfony/Tests/Commenting/LicenseUnitTest.php b/Symfony/Tests/Commenting/LicenseUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace Symfony\Tests\Commenting;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;
 
 /**
  * Unit test class for the LicenseUnitTest sniff.
@@ -30,7 +30,7 @@
  * @license  http://spdx.org/licenses/MIT MIT License
  * @link     https://github.com/djoos/Symfony2-coding-standard
  */
-class LicenseUnitTest extends AbstractSniffUnitTest
+class LicenseUnitTest extends AbstractSniffTestCase
 {
     /**
      * Returns the lines where errors should occur.
diff --git a/Symfony/Tests/Commenting/TypeHintingUnitTest.php b/Symfony/Tests/Commenting/TypeHintingUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace Symfony\Tests\Commenting;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;
 
 /**
  * Unit test class for the TypeHintingUnitTest sniff.
@@ -30,7 +30,7 @@
  * @license  http://spdx.org/licenses/MIT MIT License
  * @link     https://github.com/djoos/Symfony2-coding-standard
  */
-class TypeHintingUnitTest extends AbstractSniffUnitTest
+class TypeHintingUnitTest extends AbstractSniffTestCase
 {
     /**
      * Returns the lines where errors should occur.
diff --git a/Symfony/Tests/ControlStructure/IdenticalComparisonUnitTest.php b/Symfony/Tests/ControlStructure/IdenticalComparisonUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace Symfony\Tests\ControlStructure;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;
 
 /**
  * Unit test class for the IdenticalComparisonUnitTest sniff.
@@ -30,7 +30,7 @@
  * @license  http://spdx.org/licenses/MIT MIT License
  * @link     https://github.com/djoos/Symfony2-coding-standard
  */
-class IdenticalComparisonUnitTest extends AbstractSniffUnitTest
+class IdenticalComparisonUnitTest extends AbstractSniffTestCase
 {
     /**
      * Returns the lines where errors should occur.
diff --git a/Symfony/Tests/ControlStructure/UnaryOperatorsUnitTest.php b/Symfony/Tests/ControlStructure/UnaryOperatorsUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace Symfony\Tests\ControlStructure;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;
 
 /**
  * Unit test class for the UnaryOperatorsUnitTest sniff.
@@ -30,7 +30,7 @@
  * @license  http://spdx.org/licenses/MIT MIT License
  * @link     https://github.com/djoos/Symfony2-coding-standard
  */
-class UnaryOperatorsUnitTest extends AbstractSniffUnitTest
+class UnaryOperatorsUnitTest extends AbstractSniffTestCase
 {
     /**
      * Returns the lines where errors should occur.
diff --git a/Symfony/Tests/ControlStructure/YodaConditionsUnitTest.php b/Symfony/Tests/ControlStructure/YodaConditionsUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace Symfony\Tests\ControlStructure;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;
 
 /**
  * Unit test class for the YodaConditionsUnitTest sniff.
@@ -30,7 +30,7 @@
  * @license  http://spdx.org/licenses/MIT MIT License
  * @link     https://github.com/djoos/Symfony2-coding-standard
  */
-class YodaConditionsUnitTest extends AbstractSniffUnitTest
+class YodaConditionsUnitTest extends AbstractSniffTestCase
 {
     /**
      * Returns the lines where errors should occur.
diff --git a/Symfony/Tests/Errors/ExceptionMessageUnitTest.php b/Symfony/Tests/Errors/ExceptionMessageUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace Symfony\Tests\Errors;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;
 
 /**
  * Unit test class for the ExceptionMessageUnitTest sniff.
@@ -30,7 +30,7 @@
  * @license  http://spdx.org/licenses/MIT MIT License
  * @link     https://github.com/djoos/Symfony2-coding-standard
  */
-class ExceptionMessageUnitTest extends AbstractSniffUnitTest
+class ExceptionMessageUnitTest extends AbstractSniffTestCase
 {
     /**
      * Returns the lines where errors should occur.
diff --git a/Symfony/Tests/Errors/UserDeprecatedUnitTest.php b/Symfony/Tests/Errors/UserDeprecatedUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace Symfony\Tests\Errors;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;
 
 /**
  * Unit test class for the UserDeprecatedUnitTest sniff.
@@ -30,7 +30,7 @@
  * @license  http://spdx.org/licenses/MIT MIT License
  * @link     https://github.com/djoos/Symfony2-coding-standard
  */
-class UserDeprecatedUnitTest extends AbstractSniffUnitTest
+class UserDeprecatedUnitTest extends AbstractSniffTestCase
 {
     /**
      * Returns the lines where errors should occur.
diff --git a/Symfony/Tests/Files/AlphanumericFilenameUnitTest.php b/Symfony/Tests/Files/AlphanumericFilenameUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace Symfony\Tests\Files;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;
 
 /**
  * Unit test class for the AlphanumericFilenameUnitTest sniff.
@@ -30,7 +30,7 @@
  * @license  http://spdx.org/licenses/MIT MIT License
  * @link     https://github.com/djoos/Symfony2-coding-standard
  */
-class AlphanumericFilenameUnitTest extends AbstractSniffUnitTest
+class AlphanumericFilenameUnitTest extends AbstractSniffTestCase
 {
     /**
      * Returns the lines where errors should occur.
diff --git a/Symfony/Tests/Formatting/BlankLineBeforeReturnUnitTest.php b/Symfony/Tests/Formatting/BlankLineBeforeReturnUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace Symfony\Tests\Formatting;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;
 
 /**
  * Unit test class for the BlankLineBeforeReturn sniff.
@@ -30,7 +30,7 @@
  * @license  http://spdx.org/licenses/MIT MIT License
  * @link     https://github.com/djoos/Symfony2-coding-standard
  */
-class BlankLineBeforeReturnUnitTest extends AbstractSniffUnitTest
+class BlankLineBeforeReturnUnitTest extends AbstractSniffTestCase
 {
     /**
      * Returns the lines where errors should occur.
diff --git a/Symfony/Tests/Formatting/ReturnOrThrowUnitTest.php b/Symfony/Tests/Formatting/ReturnOrThrowUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace Symfony\Tests\Formatting;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;
 
 /**
  * Unit test class for the ReturnOrThrowUnitTest sniff.
@@ -30,7 +30,7 @@
  * @license  http://spdx.org/licenses/MIT MIT License
  * @link     https://github.com/djoos/Symfony2-coding-standard
  */
-class ReturnOrThrowUnitTest extends AbstractSniffUnitTest
+class ReturnOrThrowUnitTest extends AbstractSniffTestCase
 {
     /**
      * Returns the lines where errors should occur.
diff --git a/Symfony/Tests/Functions/ArgumentsUnitTest.php b/Symfony/Tests/Functions/ArgumentsUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace Symfony\Tests\Functions;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;
 
 /**
  * Unit test class for the ArgumentsUnitTest sniff.
@@ -30,7 +30,7 @@
  * @license  http://spdx.org/licenses/MIT MIT License
  * @link     https://github.com/djoos/Symfony2-coding-standard
  */
-class ArgumentsUnitTest extends AbstractSniffUnitTest
+class ArgumentsUnitTest extends AbstractSniffTestCase
 {
     /**
      * Returns the lines where errors should occur.
diff --git a/Symfony/Tests/Functions/ReturnTypeUnitTest.php b/Symfony/Tests/Functions/ReturnTypeUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace Symfony\Tests\Functions;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;
 
 /**
  * Unit test class for the ReturnTypeUnitTest sniff.
@@ -30,7 +30,7 @@
  * @license  http://spdx.org/licenses/MIT MIT License
  * @link     https://github.com/djoos/Symfony2-coding-standard
  */
-class ReturnTypeUnitTest extends AbstractSniffUnitTest
+class ReturnTypeUnitTest extends AbstractSniffTestCase
 {
     /**
      * Returns the lines where errors should occur.
diff --git a/Symfony/Tests/Functions/ScopeOrderUnitTest.php b/Symfony/Tests/Functions/ScopeOrderUnitTest.php
diff --git a/Symfony/Tests/NamingConventions/ValidClassNameUnitTest.php b/Symfony/Tests/NamingConventions/ValidClassNameUnitTest.php
diff --git a/Symfony/Tests/Objects/ObjectInstantiationUnitTest.php b/Symfony/Tests/Objects/ObjectInstantiationUnitTest.php
diff --git a/Symfony/Tests/Whitespace/AssignmentSpacingUnitTest.php b/Symfony/Tests/Whitespace/AssignmentSpacingUnitTest.php
diff --git a/Symfony/Tests/Whitespace/BinaryOperatorSpacingUnitTest.php b/Symfony/Tests/Whitespace/BinaryOperatorSpacingUnitTest.php
diff --git a/Symfony/Tests/Whitespace/CommaSpacingUnitTest.php b/Symfony/Tests/Whitespace/CommaSpacingUnitTest.php
diff --git a/Symfony/Tests/Whitespace/DiscourageFitzinatorUnitTest.php b/Symfony/Tests/Whitespace/DiscourageFitzinatorUnitTest.php
diff --git a/Symfony/ruleset.xml b/Symfony/ruleset.xml
diff --git a/composer.json b/composer.json
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
diff --git a/tests_bootstrap.php b/tests_bootstrap.php

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class ClassCommentSniff extends Sniff`
`46`	`46`	`*`
`47`	`47`	`* @var array`
`48`	`48`	`*/`
`49`		`- protected $tags = array(`
	`49`	`+ protected const EXPECTED_TAGS = array(`
`50`	`50`	`'category' => array(`
`51`	`51`	`'required' => false,`
`52`	`52`	`'allow_multiple' => false,`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ public function register()`
`38`	`38`	`{`
`39`	`39`	`return array(`
`40`	`40`	`T_STRING,`
	`41`	`+ T_NAME_FULLY_QUALIFIED,`
`41`	`42`	`);`
`42`	`43`	`}`
`43`	`44`
`@@ -58,7 +59,9 @@ public function process(File $phpcsFile, $stackPtr)`
`58`	`59`	`{`
`59`	`60`	`$tokens = $phpcsFile->getTokens();`
`60`	`61`
`61`		`- if ($tokens[$stackPtr]['content'] !== 'trigger_error') {`
	`62`	`+ if ($tokens[$stackPtr]['content'] !== 'trigger_error'`
	`63`	`+ && $tokens[$stackPtr]['content'] !== '\trigger_error'`
	`64`	`+ ) {`
`62`	`65`	`return;`
`63`	`66`	`}`
`64`	`67`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class AssignmentSpacingSniff implements Sniff`
`49`	`49`	`*/`
`50`	`50`	`public function register()`
`51`	`51`	`{`
`52`		`- return Tokens::$assignmentTokens;`
	`52`	`+ return Tokens::ASSIGNMENT_TOKENS;`
`53`	`53`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class BinaryOperatorSpacingSniff implements Sniff`
`49`	`49`	`*/`
`50`	`50`	`public function register()`
`51`	`51`	`{`
`52`		`- return Tokens::$comparisonTokens;`
	`52`	`+ return Tokens::COMPARISON_TOKENS;`
`53`	`53`
`54`	`54`	`}`
`55`	`55`