Merge branch 'feature/psr12-classinstantiation-bug-fix-attributes-vs-…

…anon-class' of https://github.com/jrfnl/PHP_CodeSniffer
PHPCSStandards · Dec 12, 2021 · 40afa3d · 40afa3d
2 parents 5b660ae + 76faf86
commit 40afa3d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/src/Standards/PSR12/Sniffs/Classes/ClassInstantiationSniff.php b/src/Standards/PSR12/Sniffs/Classes/ClassInstantiationSniff.php
@@ -63,6 +63,14 @@ public function process(File $phpcsFile, $stackPtr)
                 continue;
             }
 
+            // Skip over potential attributes for anonymous classes.
+            if ($tokens[$i]['code'] === T_ATTRIBUTE
+                && isset($tokens[$i]['attribute_closer']) === true
+            ) {
+                $i = $tokens[$i]['attribute_closer'];
+                continue;
+            }
+
             if ($tokens[$i]['code'] === T_OPEN_SQUARE_BRACKET
                 || $tokens[$i]['code'] === T_OPEN_CURLY_BRACKET
             ) {
@@ -72,7 +80,7 @@ public function process(File $phpcsFile, $stackPtr)
 
             $classNameEnd = $i;
             break;
-        }
+        }//end for
 
         if ($classNameEnd === null) {
             return;
@@ -88,6 +96,11 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
+        if ($classNameEnd === $stackPtr) {
+            // Failed to find the class name.
+            return;
+        }
+
         $error = 'Parentheses must be used when instantiating a new class';
         $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'MissingParentheses');
         if ($fix === true) {

diff --git a/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.inc b/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.inc
@@ -36,3 +36,9 @@ $a = new ${$varHoldingClassName};
 $class = new $obj?->classname();
 $class = new $obj?->classname;
 $class = new ${$obj?->classname};
+
+// Issue 3456.
+// Anon classes should be skipped, even when there is an attribute between the new and the class keywords.
+$anonWithAttribute = new #[SomeAttribute('summary')] class {
+    public const SOME_STUFF = 'foo';
+};
diff --git a/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.inc.fixed b/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.inc.fixed
@@ -36,3 +36,9 @@ $a = new ${$varHoldingClassName}();
 $class = new $obj?->classname();
 $class = new $obj?->classname();
 $class = new ${$obj?->classname}();
+
+// Issue 3456.
+// Anon classes should be skipped, even when there is an attribute between the new and the class keywords.
+$anonWithAttribute = new #[SomeAttribute('summary')] class {
+    public const SOME_STUFF = 'foo';
+};