icedream
/
php-language-server
1
0
Fork 0
Code Releases Activity

fix(DefinitionResolver): fix methods with self return type (#550)

@semantic-release/github-3.0.0-69.1.0
Phil Nelson 2017-12-23 13:02:37 +11:00 committed by Felix Becker
parent 9eea26df71
commit 63da051e72
4 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/DefinitionResolver.php
View File

@ -729,7 +729,7 @@ class DefinitionResolver
foreach ($classDef->getAncestorDefinitions($this->index, true) as $fqn => $def) {
$def = $this->index->getDefinition($fqn . $add);
if ($def !== null) {
if ($def->type instanceof Types\This) {
if ($def->type instanceof Types\This || $def->type instanceof Types\Self_) {
return new Types\Object_(new Fqsen('\\' . $classFqn));
}
return $def->type;
@ -1090,6 +1090,12 @@ class DefinitionResolver
if ($node->returnType instanceof PhpParser\Token) {
// Resolve a string like "bool" to a type object
return $this->typeResolver->resolve($node->returnType->getText($node->getFileContents()));
} elseif ($node->returnType->getResolvedName() === 'self') {
$classNode = $node->getFirstAncestor(Node\Statement\ClassDeclaration::class);
if ($classNode) {
$classFqn = (string)$classNode->getNamespacedName();
return new Types\Object_(new Fqsen('\\' . $classFqn));
}
}
return new Types\Object_(new Fqsen('\\' . (string)$node->returnType->getResolvedName()));
}

2
tests/Validation/cases/WithReturnTypehints.php.expected.json
View File

@ -71,7 +71,7 @@
},
"containerName": "Fixtures\\Prophecy\\WithReturnTypehints"
},
"type__tostring": "\\self",
"type__tostring": "\\Fixtures\\Prophecy\\WithReturnTypehints",
"type": {},
"declarationLine": "public function getSelf(): self {",
"documentation": null,

2
tests/Validation/cases/staticMethodReturnType.php
View File

@ -5,5 +5,7 @@ class FooClass {
return new FooClass();
}
public static function staticSelf(): self { }
public function bar() { }
}

25
tests/Validation/cases/staticMethodReturnType.php.expected.json
View File

@ -50,6 +50,31 @@
"parameters": []
}
},
"FooClass::staticSelf()": {
"fqn": "FooClass::staticSelf()",
"extends": [],
"isMember": true,
"roamed": false,
"isStatic": true,
"canBeInstantiated": false,
"symbolInformation": {
"name": "staticSelf",
"kind": 6,
"location": {
"uri": "./staticMethodReturnType.php"
},
"containerName": "FooClass"
},
"type__tostring": "\\FooClass",
"type": {},
"declarationLine": "public static function staticSelf(): self { }",
"documentation": null,
"signatureInformation": {
"label": "()",
"documentation": null,
"parameters": []
}
},
"FooClass->bar()": {
"fqn": "FooClass->bar()",
"extends": [],