BCFile::findExtendedClassName(): sync with PHPCS 4.0 / handling of namespace relative parent classes

The PHPCS `File::findExtendedClassName()` method did not handle namespace relative parent classes correctly prior to PHPCS 4.0.

The PHPCSUtils native `ObjectDeclarations::findExtendedClassName()` method **_did_** already handle this correctly.

This commit adds the PHPCS 4.x version of the `findExtendedClassName()` method to the `BCFile` class.

Includes moving related tests from the "Diff" test file to the "normal" test file and updating the docs to annotate this is no longer a difference between the PHPCS native and PHPCSUtils versions of the method.

Author: jrfnl

PHPCSUtils/BackCompat/BCFile.php

@@ -905,7 +905,7 @@ public static function getCondition(File $phpcsFile, $stackPtr, $type, $first =
      *
      * Changelog for the PHPCS native function:
      * - Introduced in PHPCS 1.2.0.
-     * - The upstream method has received no significant updates since PHPCS 3.13.0.
+     * - PHPCS 4.0.0: Handling of the namespace relative parent class using the namespace keyword as operator.
      *
      * @see \PHP_CodeSniffer\Files\File::findExtendedClassName()          Original source.
      * @see \PHPCSUtils\Utils\ObjectDeclarations::findExtendedClassName() PHPCSUtils native improved version.
@@ -920,7 +920,42 @@ public static function getCondition(File $phpcsFile, $stackPtr, $type, $first =
      */
     public static function findExtendedClassName(File $phpcsFile, $stackPtr)
     {
-        return $phpcsFile->findExtendedClassName($stackPtr);
+        $tokens = $phpcsFile->getTokens();
+
+        // Check for the existence of the token.
+        if (isset($tokens[$stackPtr]) === false) {
+            return false;
+        }
+
+        if ($tokens[$stackPtr]['code'] !== T_CLASS
+            && $tokens[$stackPtr]['code'] !== T_ANON_CLASS
+            && $tokens[$stackPtr]['code'] !== T_INTERFACE
+        ) {
+            return false;
+        }
+
+        if (isset($tokens[$stackPtr]['scope_opener']) === false) {
+            return false;
+        }
+
+        $classOpenerIndex = $tokens[$stackPtr]['scope_opener'];
+        $extendsIndex     = $phpcsFile->findNext(T_EXTENDS, $stackPtr, $classOpenerIndex);
+        if ($extendsIndex === false) {
+            return false;
+        }
+
+        $find   = Collections::namespacedNameTokens();
+        $find[] = T_WHITESPACE;
+
+        $end  = $phpcsFile->findNext($find, ($extendsIndex + 1), ($classOpenerIndex + 1), true);
+        $name = $phpcsFile->getTokensAsString(($extendsIndex + 1), ($end - $extendsIndex - 1));
+        $name = trim($name);
+
+        if ($name === '') {
+            return false;
+        }
+
+        return $name;
     }
 
     /**

PHPCSUtils/Utils/ObjectDeclarations.php

@@ -242,7 +242,6 @@ public static function getClassProperties(File $phpcsFile, $stackPtr)
      * - Bugs fixed:
      *   - Handling of PHPCS annotations.
      *   - Handling of comments.
-     *   - Handling of the namespace keyword used as operator.
      * - Improved handling of parse errors.
      * - The returned name will be clean of superfluous whitespace and/or comments.
      * - Support for PHP 8.0 tokenization of identifier/namespaced names, cross-version PHP & PHPCS.

Tests/BackCompat/BCFile/FindExtendedClassNameTest.inc

@@ -15,6 +15,9 @@ class testFECNNamespacedClass extends \PHP_CodeSniffer\Tests\Core\File\testFECNC
 /* testExtendsPartiallyQualifiedClass */
 class testFECNQualifiedClass extends Core\File\RelativeClass {}
 
+/* testExtendsNamespaceRelativeClass */
+class testWithNSOperator extends namespace\Bar {}
+
 /* testNonExtendedInterface */
 interface testFECNInterface {}
 

Tests/BackCompat/BCFile/FindExtendedClassNameTest.php

@@ -121,6 +121,10 @@ public static function dataExtendedClass()
                 'identifier' => '/* testExtendsPartiallyQualifiedClass */',
                 'expected'   => 'Core\File\RelativeClass',
             ],
+            'class extends namespace relative class' => [
+                'identifier' => '/* testExtendsNamespaceRelativeClass */',
+                'expected'   => 'namespace\Bar',
+            ],
             'interface does not extend' => [
                 'identifier' => '/* testNonExtendedInterface */',
                 'expected'   => false,

Tests/Utils/ObjectDeclarations/FindExtendedClassNameDiffTest.inc

@@ -6,8 +6,5 @@ class testDeclarationWithComments
     // phpcs:ignore Stnd.Cat.Sniff -- For reasons.
     \Package\SubDir /* comment */ \ /* comment */ SomeClass /* comment */ {}
 
-/* testExtendedClassUsingNamespaceOperator */
-class testWithNSOperator extends namespace\Bar {}
-
 /* testExtendedClassStrayComma */
 class testExtendedClassStrayComma extends , testClass {} // Intentional parse error.

Tests/Utils/ObjectDeclarations/FindExtendedClassNameDiffTest.php

@@ -60,10 +60,6 @@ public static function dataFindExtendedClassName()
                 'testMarker' => '/* testDeclarationWithComments */',
                 'expected'   => '\Package\SubDir\SomeClass',
             ],
-            'namespace-operator' => [
-                'testMarker' => '/* testExtendedClassUsingNamespaceOperator */',
-                'expected'   => 'namespace\Bar',
-            ],
             'parse-error-stray-comma' => [
                 'testMarker' => '/* testExtendedClassStrayComma */',
                 'expected'   => 'testClass',