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

fix code style

pull/354/head
Jens Hausdorf 2017-04-17 21:18:19 +02:00 committed by GitHub
parent 2437c5aca6
commit d0b275b33a
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/DefinitionResolver.php
View File

@ -745,17 +745,13 @@ class DefinitionResolver
if (is_string($node->type)) { if (is_string($node->type)) {
// Resolve a string like "bool" to a type object // Resolve a string like "bool" to a type object
$type = $this->typeResolver->resolve($node->type); $type = $this->typeResolver->resolve($node->type);
} else if ($node->type instanceof Node\Name) { } else if ($node->type instanceof Node\Name && strtolower($node->type) === 'self') {
if (strtolower($node->type) === 'self') { // handle self reference
// handle self reference $class = getClosestNode($node, Node\Stmt\Class_::class);
$class = getClosestNode($node, Node\Stmt\Class_::class); if ($class !== null) {
return new Types\Object_(new Fqsen('\\' . $class->name));
if($class !== null) {
return new Types\Object_(new Fqsen('\\' . $class->name));
}
} }
} }
$type = new Types\Object_(new Fqsen('\\' . (string)$node->type));
} }
if ($node->default !== null) { if ($node->default !== null) {
$defaultType = $this->resolveExpressionNodeToType($node->default); $defaultType = $this->resolveExpressionNodeToType($node->default);
@ -784,16 +780,12 @@ class DefinitionResolver
// Resolve a string like "bool" to a type object // Resolve a string like "bool" to a type object
return $this->typeResolver->resolve($node->returnType); return $this->typeResolver->resolve($node->returnType);
} }
if ($node->returnType instanceof Node\Name) { if ($node->returnType instanceof Node\Name && strtolower((string)$node->returnType) === 'self') {
$type = (string)$node->returnType; // handle self reference
$class = getClosestNode($node, Node\Stmt\Class_::class);
if (strtolower($type) === 'self') { if ($class !== null) {
// handle self reference return new Types\Object_(new Fqsen('\\' . $class->name));
$class = getClosestNode($node, Node\Stmt\Class_::class);
if ($class !== null) {
return new Types\Object_(new Fqsen('\\' . $class->name));
}
} }
} }
return new Types\Object_(new Fqsen('\\' . (string)$node->returnType)); return new Types\Object_(new Fqsen('\\' . (string)$node->returnType));