Update to PHPCS 4

.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

Symfony/Sniffs/Arrays/MultiLineArrayCommaSniff.php

@@ -31,15 +31,6 @@
  */
 class MultiLineArrayCommaSniff implements Sniff
 {
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array(
-                                   'PHP',
-                                  );
-
     /**
      * Returns an array of tokens this test wants to listen for.
      *

Symfony/Sniffs/Classes/MultipleClassesOneFileSniff.php

@@ -56,15 +56,6 @@ class MultipleClassesOneFileSniff implements Sniff
      */
     protected $currentFile;
 
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array(
-        'PHP',
-    );
-
     /**
      * Returns an array of tokens this test wants to listen for.
      *

Symfony/Sniffs/Classes/PropertyDeclarationSniff.php

@@ -32,16 +32,6 @@
  */
 class PropertyDeclarationSniff implements Sniff
 {
-
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array(
-        'PHP',
-    );
-
     /**
      * Returns an array of tokens this test wants to listen for.
      *
@@ -68,10 +58,7 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
-        $end = null;
-        if (isset($tokens[$stackPtr]['scope_closer'])) {
-            $end = $tokens[$stackPtr]['scope_closer'];
-        }
+        $end = $tokens[$stackPtr]['scope_closer'] ?? null;
 
         $scope = $phpcsFile->findNext(
             T_FUNCTION,

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,

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;
         }
 

Symfony/Sniffs/Formatting/BlankLineBeforeReturnSniff.php

@@ -41,16 +41,6 @@
  */
 class BlankLineBeforeReturnSniff implements Sniff
 {
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array(
-        'PHP',
-        'JS',
-    );
-
     /**
      * Returns an array of tokens this test wants to listen for.
      *

Symfony/Sniffs/Functions/ScopeOrderSniff.php

@@ -32,16 +32,6 @@
  */
 class ScopeOrderSniff implements Sniff
 {
-
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array(
-        'PHP',
-    );
-
     /**
      * Returns an array of tokens this test wants to listen for.
      *
@@ -83,11 +73,7 @@ public function process(File $phpcsFile, $stackPtr)
         );
 
         while ($function) {
-            $end = null;
-
-            if (isset($tokens[$stackPtr]['scope_closer'])) {
-                $end = $tokens[$stackPtr]['scope_closer'];
-            }
+            $end = $tokens[$stackPtr]['scope_closer'] ?? null;
 
             $function = $phpcsFile->findNext(
                 array(

Symfony/Sniffs/NamingConventions/ValidClassNameSniff.php

@@ -32,15 +32,6 @@
  */
 class ValidClassNameSniff implements Sniff
 {
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array(
-        'PHP',
-    );
-
     /**
      * Returns an array of tokens this test wants to listen for.
      *

Symfony/Sniffs/Objects/ObjectInstantiationSniff.php

@@ -32,16 +32,6 @@
  */
 class ObjectInstantiationSniff implements Sniff
 {
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array(
-                                   'PHP',
-                                  );
-
-
     /**
      * Returns an array of tokens this test wants to listen for.
      *
@@ -69,6 +59,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,

Symfony/Sniffs/Whitespace/AssignmentSpacingSniff.php

@@ -33,23 +33,14 @@
  */
 class AssignmentSpacingSniff implements Sniff
 {
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array(
-                                   'PHP',
-                                  );
-
     /**
      * Returns an array of tokens this test wants to listen for.
      *
      * @return array
      */
     public function register()
     {
-        return Tokens::$assignmentTokens;
+        return Tokens::ASSIGNMENT_TOKENS;
 
     }
 

Symfony/Sniffs/Whitespace/BinaryOperatorSpacingSniff.php

@@ -33,23 +33,14 @@
  */
 class BinaryOperatorSpacingSniff implements Sniff
 {
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array(
-                                   'PHP',
-                                  );
-
     /**
      * Returns an array of tokens this test wants to listen for.
      *
      * @return array
      */
     public function register()
     {
-        return Tokens::$comparisonTokens;
+        return Tokens::COMPARISON_TOKENS;
 
     }
 

Symfony/Sniffs/Whitespace/CommaSpacingSniff.php

@@ -32,15 +32,6 @@
  */
 class CommaSpacingSniff implements Sniff
 {
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array(
-        'PHP',
-    );
-
     /**
      * Returns an array of tokens this test wants to listen for.
      *

Symfony/Sniffs/Whitespace/DiscourageFitzinatorSniff.php

@@ -32,18 +32,6 @@
  */
 class DiscourageFitzinatorSniff implements Sniff
 {
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array(
-                                   'PHP',
-                                   'JS',
-                                   'CSS',
-                                  );
-
-
     /**
      * Returns an array of tokens this test wants to listen for.
      *

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.

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.

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.

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.

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.

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.