✨ Property declaration improvement

Author: VincentLanglet

SymfonyCustom/Sniffs/Classes/PropertyDeclarationSniff.php

@@ -17,7 +17,7 @@ class PropertyDeclarationSniff implements Sniff
      */
     public function register(): array
     {
-        return [T_CLASS];
+        return [T_CLASS, T_ANON_CLASS];
     }
 
     /**
@@ -35,16 +35,26 @@ public function process(File $phpcsFile, $stackPtr): void
             $end = $tokens[$stackPtr]['scope_closer'];
         }
 
-        $scope = $phpcsFile->findNext(T_FUNCTION, $stackPtr, $end);
+        $function = $phpcsFile->findNext(T_FUNCTION, $stackPtr, $end);
+        if (false === $function) {
+            return;
+        }
 
-        $wantedTokens = [T_PUBLIC, T_PROTECTED, T_PRIVATE];
+        $wantedTokens = [T_PUBLIC, T_PROTECTED, T_PRIVATE, T_ANON_CLASS];
+        $scope = $phpcsFile->findNext($wantedTokens, $function + 1, $end);
 
-        while ($scope) {
-            $scope = $phpcsFile->findNext($wantedTokens, $scope + 1, $end);
+        while (false !== $scope) {
+            if (T_ANON_CLASS === $tokens[$scope]['code']) {
+                $scope = $tokens[$scope]['scope_closer'];
+
+                continue;
+            }
 
-            if ($scope && T_VARIABLE === $tokens[$scope + 2]['code']) {
+            if (T_VARIABLE === $tokens[$scope + 2]['code']) {
                 $phpcsFile->addError('Declare class properties before methods', $scope, 'Invalid');
             }
+
+            $scope = $phpcsFile->findNext($wantedTokens, $scope + 1, $end);
         }
     }
 }

SymfonyCustom/Tests/Classes/PropertyDeclarationUnitTest.inc

@@ -8,3 +8,39 @@ class ClassTest
 
     private $property;
 }
+
+class Bar
+{
+    public function doStuff()
+    {
+        $var1 = 'foo';
+        $var2 = 'bar';
+
+        $anonClass = new class($var1, $var2)
+        {
+            private $property;
+
+            public function thisIsAfterTheProperty()
+            {
+            }
+        };
+    }
+}
+
+class MoreBar
+{
+    public function doStuff()
+    {
+        $var1 = 'foo';
+        $var2 = 'bar';
+
+        $anonClass = new class($var1, $var2)
+        {
+            public function thisShouldBeAfterTheProperty()
+            {
+            }
+
+            private $property;
+        };
+    }
+}

SymfonyCustom/Tests/Classes/PropertyDeclarationUnitTest.php

@@ -17,7 +17,8 @@ class PropertyDeclarationUnitTest extends AbstractSniffUnitTest
     protected function getErrorList(): array
     {
         return [
-            9 => 1,
+            9  => 1,
+            43 => 1,
         ];
     }