Generic/ConstructorName: bug fix - false positive on static call to other class

When determining whether or not a "parent" constructor was being called using a call to a PHP4-style constructor, the sniff would only look at the _next_ token after a double colon, disregarding completely the class the method is being called on.

This would lead to false positives for method calls to other classes, which would just happen to have a method named the same as the class being extended.

This commit fixes this by verifying that the previous non-empty token before the double colon is either a hierarchy keyword or the name of the class being extended and only throwing an error if that's the case.

Includes tests.

Author: jrfnl

src/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php

@@ -106,15 +106,26 @@ protected function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScop
         $startIndex       = $stackPtr;
         while (($doubleColonIndex = $phpcsFile->findNext(T_DOUBLE_COLON, $startIndex, $endFunctionIndex)) !== false) {
             $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($doubleColonIndex + 1), null, true);
-            if ($tokens[$nextNonEmpty]['code'] === T_STRING
-                && strtolower($tokens[$nextNonEmpty]['content']) === $parentClassNameLc
+            if ($tokens[$nextNonEmpty]['code'] !== T_STRING
+                || strtolower($tokens[$nextNonEmpty]['content']) !== $parentClassNameLc
+            ) {
+                $startIndex = $nextNonEmpty;
+                continue;
+            }
+
+            $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($doubleColonIndex - 1), null, true);
+            if ($tokens[$prevNonEmpty]['code'] === T_PARENT
+                || $tokens[$prevNonEmpty]['code'] === T_SELF
+                || $tokens[$prevNonEmpty]['code'] === T_STATIC
+                || ($tokens[$prevNonEmpty]['code'] === T_STRING
+                && strtolower($tokens[$prevNonEmpty]['content']) === $parentClassNameLc)
             ) {
                 $error = 'PHP4 style calls to parent constructors are not allowed; use "parent::__construct()" instead';
                 $phpcsFile->addError($error, $nextNonEmpty, 'OldStyleCall');
             }
 
             $startIndex = $nextNonEmpty;
-        }
+        }//end while
 
     }//end processTokenWithinScope()
 

src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.inc

@@ -101,7 +101,7 @@ class UnconventionalSpacing extends MyParent
 {
     public function UnconventionalSpacing() {
         self   ::   MyParent();
-        static/*comment*/::/*comment*/MyParent();
+        MyParent/*comment*/::/*comment*/MyParent();
     }
 
     public function __construct() {
@@ -112,3 +112,19 @@ class UnconventionalSpacing extends MyParent
         MyParent();
     }
 }
+
+// Bug: calling a method with the same name as the class being extended on another class, should not be flagged.
+class HierarchyKeywordBeforeColon extends MyParent
+{
+    public function HierarchyKeywordBeforeColon() {
+        parent::MyParent();
+        MyParent::MyParent();
+        SomeOtherClass::MyParent();
+    }
+
+    public function __construct() {
+        self::MyParent();
+        static::MyParent();
+        SomeOtherClass::MyParent();
+    }
+}

src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php

@@ -39,6 +39,10 @@ public function getErrorList()
             103 => 1,
             104 => 1,
             112 => 1,
+            120 => 1,
+            121 => 1,
+            126 => 1,
+            127 => 1,
         ];
 
     }//end getErrorList()