Skip to content

Treat trait properties as definitions #40

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
Apr 20, 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, int $stackPtr) {
if (($scopeCode === T_FUNCTION) || ($scopeCode === T_CLOSURE)) {
return $scopePtr;
}
if (($scopeCode === T_CLASS) || ($scopeCode === T_INTERFACE)) {
if (in_array($scopeCode, [T_CLASS, T_INTERFACE, T_TRAIT])) {
$in_class = true;
}
}
Expand Down
12 changes: 12 additions & 0 deletions VariableAnalysis/Tests/CodeAnalysis/VariableAnalysisTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -401,4 +401,16 @@ public function testVariableFunctionCallsCountAsUsage() {
$expectedErrors = [];
$this->assertEquals($expectedErrors, $lines);
}

public function testTraitsAllowPropertyDefinitions() {
$fixtureFile = $this->getFixture('TraitWithPropertiesFixture.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);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

trait Hello {
protected $storedHello;
public $helloOptions = [];
public function sayHelloWorld() {
echo "hello world";
}
abstract public function getWorld();
}