Fix false positive with anon class variables (#174)

mmoll · djoos · commit 369b5f2579be · 2019-09-25T09:43:58.000+01:00
diff --git a/Symfony/Sniffs/Classes/PropertyDeclarationSniff.php b/Symfony/Sniffs/Classes/PropertyDeclarationSniff.php
@@ -97,7 +97,9 @@ public function process(File $phpcsFile, $stackPtr)
                 $end
             );
 
-            if ($scope && $tokens[$scope + 2]['code'] === T_VARIABLE) {
+            if ($scope && $tokens[$scope + 2]['code'] === T_VARIABLE
+                && $tokens[$scope]['code'] !== T_ANON_CLASS
+            ) {
                 $phpcsFile->addError(
                     'Declare class properties before methods',
                     $scope,
diff --git a/Symfony/Tests/Classes/PropertyDeclarationUnitTest.inc b/Symfony/Tests/Classes/PropertyDeclarationUnitTest.inc
@@ -26,3 +26,37 @@ class Factory
         };
     }
 }
+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;
+        };
+    }
+}
diff --git a/Symfony/Tests/Classes/PropertyDeclarationUnitTest.php b/Symfony/Tests/Classes/PropertyDeclarationUnitTest.php
@@ -45,6 +45,7 @@ public function getErrorList()
         return array(
             9  => 1,
             17 => 1,
+            59 => 1,
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public function getErrorList()`
`45`	`45`	`return array(`
`46`	`46`	`9 => 1,`
`47`	`47`	`17 => 1,`
	`48`	`+ 59 => 1,`
`48`	`49`	`);`
`49`	`50`	`}`
`50`	`51`