Do not ignore closures

squizlabs · Jan 6, 2020 · 0a6c51e · 0a6c51e
1 parent 1504f91
commit 0a6c51e
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 15 deletions.
diff --git a/src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php b/src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php
@@ -69,13 +69,10 @@ public function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScope)
         $end  = $tokens[$stackPtr]['scope_closer'];
 
         do {
-            $next = $phpcsFile->findNext([T_VARIABLE, T_CLOSURE, T_FN, T_ANON_CLASS], ($next + 1), $end);
+            $next = $phpcsFile->findNext([T_VARIABLE, T_ANON_CLASS], ($next + 1), $end);
             if ($next === false) {
                 continue;
-            } else if ($tokens[$next]['code'] === T_CLOSURE
-                || $tokens[$next]['code'] === T_FN
-                || $tokens[$next]['code'] === T_ANON_CLASS
-            ) {
+            } else if ($tokens[$next]['code'] === T_ANON_CLASS) {
                 $next = $tokens[$next]['scope_closer'];
                 continue;
             } else if (strtolower($tokens[$next]['content']) !== '$this') {

diff --git a/src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.inc b/src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.inc
@@ -57,26 +57,55 @@ class MyClass
 
     public function getAnonymousClass() {
         return new class() {
-			public static function something() {
-				$this->doSomething();
+            public static function something() {
+                $this->doSomething();
             }
         };
     }
 }
 
 trait MyTrait {
-	public static function myFunc() {
-		$this->doSomething();
-	}
+    public static function myFunc() {
+        $this->doSomething();
+    }
 }
 
 $b = new class()
 {
-	public static function myFunc() {
-		$this->doSomething();
-	}
+    public static function myFunc() {
+        $this->doSomething();
+    }
+
+    public static function other() {
+        return fn () => $this->name;
+    }
+
+    public static function anonClassUseThis() {
+        return new class($this) {
+            public function __construct($class) {
+            }
+        };
+    }
+
+    public static function anonClassAnotherThis() {
+        return new class() {
+            public function __construct() {
+                $this->id = 1;
+            }
+        };
+    }
 
-	public static function other() {
-	    return fn () => $this->name;
+    public static function anonClassNestedUseThis() {
+        return new class(new class($this) {}) {
+        };
+    }
+
+    public static function anonClassNestedAnotherThis() {
+        return new class(new class() {
+            public function __construct() {
+                $this->id = 1;
+            }
+        }) {
+        };
     }
 }
diff --git a/src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php b/src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php
@@ -31,9 +31,13 @@ public function getErrorList()
             9  => 1,
             14 => 1,
             20 => 1,
+            41 => 1,
             61 => 1,
             69 => 1,
             76 => 1,
+            80 => 1,
+            84 => 1,
+            99 => 1,
         ];
 
     }//end getErrorList()