Merge branch 'feature/bugfix-find-extended-class' of https://github.com/jrfnl/PHP_CodeSniffer

Author: gsherwood

src/Files/File.php

@@ -2377,12 +2377,12 @@ public function findExtendedClassName($stackPtr)
             return false;
         }
 
-        if (isset($this->tokens[$stackPtr]['scope_closer']) === false) {
+        if (isset($this->tokens[$stackPtr]['scope_opener']) === false) {
             return false;
         }
 
-        $classCloserIndex = $this->tokens[$stackPtr]['scope_closer'];
-        $extendsIndex     = $this->findNext(T_EXTENDS, $stackPtr, $classCloserIndex);
+        $classOpenerIndex = $this->tokens[$stackPtr]['scope_opener'];
+        $extendsIndex     = $this->findNext(T_EXTENDS, $stackPtr, $classOpenerIndex);
         if (false === $extendsIndex) {
             return false;
         }
@@ -2393,7 +2393,7 @@ public function findExtendedClassName($stackPtr)
             T_WHITESPACE,
         ];
 
-        $end  = $this->findNext($find, ($extendsIndex + 1), $classCloserIndex, true);
+        $end  = $this->findNext($find, ($extendsIndex + 1), ($classOpenerIndex + 1), true);
         $name = $this->getTokensAsString(($extendsIndex + 1), ($end - $extendsIndex - 1));
         $name = trim($name);
 

tests/Core/File/FindExtendedClassNameTest.inc

@@ -22,3 +22,11 @@ interface testInterfaceThatExtendsInterface extends testFECNInterface{}
 
 /* testInterfaceThatExtendsFQCNInterface */
 interface testInterfaceThatExtendsFQCNInterface extends \PHP_CodeSniffer\Tests\Core\File\testFECNInterface{}
+
+/* testNestedExtendedClass */
+class testFECNNestedExtendedClass {
+	public function someMethod() {
+		/* testNestedExtendedAnonClass */
+		$anon = new class extends testFECNAnonClass {};
+	}
+}

tests/Core/File/FindExtendedClassNameTest.php

@@ -191,4 +191,49 @@ public function testExtendedNamespacedInterface()
     }//end testExtendedNamespacedInterface()
 
 
+    /**
+     * Test a non-extended class with a nested class which does extend another class.
+     *
+     * @return void
+     */
+    public function testNestedExtendedClass()
+    {
+        $start = ($this->phpcsFile->numTokens - 1);
+        $class = $this->phpcsFile->findPrevious(
+            T_COMMENT,
+            $start,
+            null,
+            false,
+            '/* testNestedExtendedClass */'
+        );
+
+        $found = $this->phpcsFile->findExtendedClassName(($class + 2));
+        $this->assertFalse($found);
+
+    }//end testNestedExtendedClass()
+
+
+    /**
+     * Test a nested anonymous class that extends a named class.
+     *
+     * @return void
+     */
+    public function testNestedExtendedAnonClass()
+    {
+        $start = ($this->phpcsFile->numTokens - 1);
+        $class = $this->phpcsFile->findPrevious(
+            T_COMMENT,
+            $start,
+            null,
+            false,
+            '/* testNestedExtendedAnonClass */'
+        );
+        $class = $this->phpcsFile->findNext(T_ANON_CLASS, ($class + 1));
+
+        $found = $this->phpcsFile->findExtendedClassName($class);
+        $this->assertSame('testFECNAnonClass', $found);
+
+    }//end testNestedExtendedAnonClass()
+
+
 }//end class