Skip to content
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

Support inherited static functions #679

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Support inherited static functions #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
df14445
ci: Add ability to find documentation for static functions defined in…
letynsoft Oct 28, 2018
c6eda5f
fix: Fix some possible notices
letynsoft Oct 28, 2018
6fa6fd5
fix: Fix spacing
letynsoft Oct 28, 2018
d231f42
Fix: Small fixes
letynsoft Oct 28, 2018
107c962
test: The inherited static methods and properties
letynsoft Dec 22, 2018
89886b1
fix: We effectively don't need these tests
letynsoft Dec 22, 2018
637f2bc
fix: We don't need these
letynsoft Dec 22, 2018
cc4a63f
fix: Move the leftovet bit outside
letynsoft Dec 22, 2018
296d105
Merge remote-tracking branch 'upstream/master'
letynsoft Dec 22, 2018
c484e65
Merge remote-tracking branch 'origin/master' into staticMethodsInParents
letynsoft Dec 22, 2018
c3b8cbd
fix: Yet another copy of unused reference
letynsoft Dec 22, 2018
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
3 changes: 3 additions & 0 deletions fixtures/global_references.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ function whatever(TestClass $param): TestClass {

$child = new ChildClass;
echo $child->testMethod();

ChildClass::staticTestMethod();
ChildClass::$staticTestProperty[123]->testProperty;
3 changes: 3 additions & 0 deletions fixtures/references.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ function whatever(TestClass $param): TestClass {

$child = new ChildClass;
echo $child->testMethod();

ChildClass::staticTestMethod();
ChildClass::$staticTestProperty[123]->testProperty;
24 changes: 21 additions & 3 deletions src/DefinitionResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,8 @@ private function resolveScopedPropertyAccessExpressionNodeToFqn(Node\Expression\
} elseif ($scoped->scopeResolutionQualifier instanceof Node\QualifiedName) {
$className = $scoped->scopeResolutionQualifier->getResolvedName();
}
$origName = null;
$nameSuffix = null;
if ($scoped->memberName instanceof Node\Expression\Variable) {
if ($scoped->parent instanceof Node\Expression\CallExpression) {
return null;
Expand All @@ -507,13 +509,29 @@ private function resolveScopedPropertyAccessExpressionNodeToFqn(Node\Expression\
if (empty($memberName)) {
return null;
}
$name = (string)$className . '::$' . $memberName;
$nameSuffix = '::$' . $memberName;
} else {
$name = (string)$className . '::' . $scoped->memberName->getText($scoped->getFileContents());
$nameSuffix = '::' . $scoped->memberName->getText($scoped->getFileContents());
}
if ($scoped->parent instanceof Node\Expression\CallExpression) {
$name .= '()';
$nameSuffix .= '()';
}
do {
$name = (string)$className . $nameSuffix;
if ($origName === null) {
$origName = $name;
}
$definition = $this->index->getDefinition($name);
if (!!$definition) {
break;
} else {
$class = $this->index->getDefinition((string)$className);
if ($class === null || empty($class->extends)) {
return $origName;
}
$className = $class->extends[0];
}
} while (true);
return $name;
}

Expand Down
12 changes: 8 additions & 4 deletions tests/Server/ServerTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,12 @@ public function setUp()
],
'TestNamespace\\TestClass::staticTestProperty' => [
0 => new Location($referencesUri, new Range(new Position( 8, 16), new Position( 8, 35))), // echo TestClass::$staticTestProperty;
1 => new Location($referencesUri, new Range(new Position(39, 11), new Position(39, 30))) // TestClass::$staticTestProperty[123]->testProperty;
1 => new Location($referencesUri, new Range(new Position(39, 11), new Position(39, 30))), // TestClass::$staticTestProperty[123]->testProperty;
2 => new Location($referencesUri, new Range(new Position(45, 12), new Position(45, 31))) // ChildClass::$staticTestProperty[123]->testProperty;
],
'TestNamespace\\TestClass::staticTestMethod()' => [
0 => new Location($referencesUri, new Range(new Position( 7, 0), new Position( 7, 27)))
0 => new Location($referencesUri, new Range(new Position( 7, 0), new Position( 7, 27))),
1 => new Location($referencesUri, new Range(new Position(44, 0), new Position(44, 28)))
],
'TestNamespace\\TestClass::testMethod()' => [
0 => new Location($referencesUri, new Range(new Position( 5, 0), new Position( 5, 16))), // $obj->testMethod();
Expand Down Expand Up @@ -209,10 +211,12 @@ public function setUp()
],
'TestClass::staticTestProperty' => [
0 => new Location($globalReferencesUri, new Range(new Position( 8, 16), new Position( 8, 35))), // echo TestClass::$staticTestProperty;
1 => new Location($globalReferencesUri, new Range(new Position(39, 11), new Position(39, 30))) // TestClass::$staticTestProperty[123]->testProperty;
1 => new Location($globalReferencesUri, new Range(new Position(39, 11), new Position(39, 30))), // TestClass::$staticTestProperty[123]->testProperty;
2 => new Location($globalReferencesUri, new Range(new Position(45, 12), new Position(45, 31))) // ChildClass::$staticTestProperty[123]->testProperty;
],
'TestClass::staticTestMethod()' => [
0 => new Location($globalReferencesUri, new Range(new Position( 7, 0), new Position( 7, 27)))
0 => new Location($globalReferencesUri, new Range(new Position( 7, 0), new Position( 7, 27))),
1 => new Location($globalReferencesUri, new Range(new Position(44, 0), new Position(44, 28)))
],
'TestClass::testMethod()' => [
0 => new Location($globalReferencesUri, new Range(new Position( 5, 0), new Position( 5, 16))), // $obj->testMethod();
Expand Down