Allow $this within closures (#20)

sirbrillig · web-flow · commit 457183ff74e6 · 2017-12-19T18:37:19.000-05:00
* Update tests to allow this inside closures

* Allow `$this` within closures
diff --git a/VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php b/VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php
@@ -765,10 +765,10 @@ protected function checkForThisWithinClass(
     }
 
     foreach (array_reverse($token['conditions'], true) as $scopePtr => $scopeCode) {
-      //  $this within a closure is invalid
+      //  $this within a closure is valid
       //  Note: have to fetch code from $tokens, T_CLOSURE isn't set for conditions codes.
       if ($tokens[$scopePtr]['code'] === T_CLOSURE) {
-        return false;
+        return true;
       }
       if ($scopeCode === T_CLASS) {
         return true;
diff --git a/VariableAnalysis/Tests/CodeAnalysis/VariableAnalysisTest.php b/VariableAnalysis/Tests/CodeAnalysis/VariableAnalysisTest.php
@@ -194,8 +194,6 @@ public function testFunctionWithClosureWarnings() {
       26,
       27,
       28,
-      36,
-      37,
       35,
     ];
     $this->assertEquals($expectedWarnings, $lines);

Original file line number	Diff line number	Diff line change
`@@ -765,10 +765,10 @@ protected function checkForThisWithinClass(`
`765`	`765`	`}`
`766`	`766`
`767`	`767`	`foreach (array_reverse($token['conditions'], true) as $scopePtr => $scopeCode) {`
`768`		`- // $this within a closure is invalid`
	`768`	`+ // $this within a closure is valid`
`769`	`769`	`// Note: have to fetch code from $tokens, T_CLOSURE isn't set for conditions codes.`
`770`	`770`	`if ($tokens[$scopePtr]['code'] === T_CLOSURE) {`
`771`		`- return false;`
	`771`	`+ return true;`
`772`	`772`	`}`
`773`	`773`	`if ($scopeCode === T_CLASS) {`
`774`	`774`	`return true;`
-Original file line number
+Diff line change
 ,
 ,
 ,
 -      36,
 -      37,
 ,
     ];
     $this->assertEquals($expectedWarnings, $lines);