Merge branch 'hotfix/static-this-usage-array-closure' of https://github.com/michalbundyra/PHP_CodeSniffer

Author: gsherwood

src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php

@@ -68,24 +68,45 @@ public function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScope)
         $next = $stackPtr;
         $end  = $tokens[$stackPtr]['scope_closer'];
 
+        $this->checkThisUsage($phpcsFile, $next, $end);
+
+    }//end processTokenWithinScope()
+
+
+    /**
+     * Check for $this variable usage between $next and $end tokens.
+     *
+     * @param File $phpcsFile The current file being scanned.
+     * @param int  $next      The position of the next token to check.
+     * @param int  $end       The position of the last token to check.
+     *
+     * @return void
+     */
+    private function checkThisUsage(File $phpcsFile, $next, $end)
+    {
+        $tokens = $phpcsFile->getTokens();
+
         do {
-            $next = $phpcsFile->findNext([T_VARIABLE, T_CLOSURE, 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_ANON_CLASS
-            ) {
+            }
+
+            if ($tokens[$next]['code'] === T_ANON_CLASS) {
+                $this->checkThisUsage($phpcsFile, $next, $tokens[$next]['scope_opener']);
                 $next = $tokens[$next]['scope_closer'];
                 continue;
-            } else if (strtolower($tokens[$next]['content']) !== '$this') {
+            }
+
+            if ($tokens[$next]['content'] !== '$this') {
                 continue;
             }
 
             $error = 'Usage of "$this" in static methods will cause runtime errors';
             $phpcsFile->addError($error, $next, 'Found');
         } while ($next !== false);
 
-    }//end processTokenWithinScope()
+    }//end checkThisUsage()
 
 
     /**

src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.inc

@@ -57,22 +57,61 @@ 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 anonClassNestedUseThis() {
+        return new class(new class($this) {}) {
+        };
+    }
+
+    public static function anonClassNestedAnotherThis() {
+        return new class(new class() {
+            public function __construct() {
+                $this->id = 1;
+            }
+        }) {
+        };
+    }
+
+    public static function thisMustBeLowercase() {
+        $This = 'hey';
+
+        return $This;
+    }
 }

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()