Skip to content

Support anonymous classes #53

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.

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
Oct 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion VariableAnalysis/Lib/Helpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public static function findVariableScope(File $phpcsFile, $stackPtr) {
if (($scopeCode === T_FUNCTION) || ($scopeCode === T_CLOSURE)) {
return $scopePtr;
}
if (in_array($scopeCode, [T_CLASS, T_INTERFACE, T_TRAIT])) {
if (in_array($scopeCode, [T_CLASS, T_ANON_CLASS, T_INTERFACE, T_TRAIT])) {
$in_class = true;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ protected function checkForThisWithinClass(File $phpcsFile, $stackPtr, $varName,
if ($tokens[$scopePtr]['code'] === T_CLOSURE) {
return true;
}
if ($scopeCode === T_CLASS || $scopeCode === T_TRAIT) {
if ($scopeCode === T_CLASS || $scopeCode === T_ANON_CLASS || $scopeCode === T_TRAIT) {
return true;
}
}
Expand Down
24 changes: 24 additions & 0 deletions VariableAnalysis/Tests/CodeAnalysis/VariableAnalysisTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,18 @@ public function testTraitAllowsThis() {
$this->assertEquals($expectedErrors, $lines);
}

public function testAnonymousClassAllowsThis() {
$fixtureFile = $this->getFixture('AnonymousClassFixture.php');
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
$phpcsFile->process();
$lines = $this->getWarningLineNumbersFromFile($phpcsFile);
$expectedWarnings = [];
$this->assertEquals($expectedWarnings, $lines);
$lines = $this->getErrorLineNumbersFromFile($phpcsFile);
$expectedErrors = [];
$this->assertEquals($expectedErrors, $lines);
}

public function testVariableFunctionCallsCountAsUsage() {
$fixtureFile = $this->getFixture('FunctionWithVariableCallFixture.php');
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
Expand All @@ -414,6 +426,18 @@ public function testTraitsAllowPropertyDefinitions() {
$this->assertEquals($expectedErrors, $lines);
}

public function testAnonymousClassAllowPropertyDefinitions() {
$fixtureFile = $this->getFixture('AnonymousClassWithPropertiesFixture.php');
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
$phpcsFile->process();
$lines = $this->getWarningLineNumbersFromFile($phpcsFile);
$expectedWarnings = [];
$this->assertEquals($expectedWarnings, $lines);
$lines = $this->getErrorLineNumbersFromFile($phpcsFile);
$expectedErrors = [];
$this->assertEquals($expectedErrors, $lines);
}

public function testUnusedParamsAreReported() {
$fixtureFile = $this->getFixture('FunctionWithUnusedParamsFixture.php');
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

new class {
public function sayHelloWorld() {
echo 'Hello'.$this->getWorld();
}

protected function getWorld() {
return ' World!';
}
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

new class {
protected $storedHello;
public $helloOptions = [];
public function sayHelloWorld() {
echo "hello world";
}
};