Merge pull request #324 from PHPCSStandards/php-8.3/psr12-classinstantiation-allow-for-readonly-anon-classes

PHP 8.3 | PSR12/ClassInstantiation: allow for readonly anonymous classes

Author: jrfnl

src/Standards/PSR12/Sniffs/Classes/ClassInstantiationSniff.php

@@ -64,12 +64,14 @@ public function process(File $phpcsFile, $stackPtr)
                 continue;
             }
 
-            // Skip over potential attributes for anonymous classes.
+            // Bow out when this is an anonymous class.
+            // Anonymous classes are the only situation which would allow for an attribute
+            // or for the readonly keyword between "new" and the class "name".
             if ($tokens[$i]['code'] === T_ATTRIBUTE
-                && isset($tokens[$i]['attribute_closer']) === true
+                || $tokens[$i]['code'] === T_READONLY
+                || $tokens[$i]['code'] === T_ANON_CLASS
             ) {
-                $i = $tokens[$i]['attribute_closer'];
-                continue;
+                return;
             }
 
             if ($tokens[$i]['code'] === T_OPEN_SQUARE_BRACKET
@@ -87,11 +89,6 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        if ($tokens[$classNameEnd]['code'] === T_ANON_CLASS) {
-            // Ignore anon classes.
-            return;
-        }
-
         if ($tokens[$classNameEnd]['code'] === T_OPEN_PARENTHESIS) {
             // Using parenthesis.
             return;

src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.inc

@@ -45,3 +45,7 @@ $anonWithAttribute = new #[SomeAttribute('summary')] class {
 
 $foo = new parent();
 $foo = new parent;
+
+// PHP 8.3: safeguard that the sniff ignores anonymous classes, even when declared as readonly.
+$anon = new readonly class {};
+$anon = new #[MyAttribute] readonly class {};

src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.inc.fixed

@@ -45,3 +45,7 @@ $anonWithAttribute = new #[SomeAttribute('summary')] class {
 
 $foo = new parent();
 $foo = new parent();
+
+// PHP 8.3: safeguard that the sniff ignores anonymous classes, even when declared as readonly.
+$anon = new readonly class {};
+$anon = new #[MyAttribute] readonly class {};