Skip to content

Allow $this within closures #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 19, 2017
Merged

Allow $this within closures #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed0e0cd
Update tests to allow this inside closures
sirbrillig Dec 19, 2017
7795146
Allow `$this` within closures
sirbrillig Dec 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions VariableAnalysis/Tests/CodeAnalysis/VariableAnalysisTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,6 @@ public function testFunctionWithClosureWarnings() {
26,
27,
28,
36,
37,
35,
];
$this->assertEquals($expectedWarnings, $lines);
Expand Down