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

Fix return types

pull/307/head
Matthew Brown 2017-02-17 19:04:43 -05:00 committed by GitHub
parent c3db70372e
commit 026a86acc8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/DefinitionResolver.php
View File

@ -416,7 +416,7 @@ class DefinitionResolver
* If the type could not be resolved, returns Types\Mixed. * If the type could not be resolved, returns Types\Mixed.
* *
* @param \PhpParser\Node\Expr $expr * @param \PhpParser\Node\Expr $expr
* @return \phpDocumentor\Reflection\Type|\phpDocumentor\Type|null * @return \phpDocumentor\Reflection\Type
*/ */
public function resolveExpressionNodeToType(Node\Expr $expr): Type public function resolveExpressionNodeToType(Node\Expr $expr): Type
{ {
@ -714,7 +714,7 @@ class DefinitionResolver
* Returns null if the node does not have a type. * Returns null if the node does not have a type.
* *
* @param Node $node * @param Node $node
* @return \phpDocumentor\Type|null * @return \phpDocumentor\Reflection\Type|null
*/ */
public function getTypeFromNode(Node $node) public function getTypeFromNode(Node $node)
{ {
@ -732,6 +732,7 @@ class DefinitionResolver
} }
} }
} }
$type = null;
if ($node->type !== null) { if ($node->type !== null) {
// Use PHP7 return type hint // Use PHP7 return type hint
if (is_string($node->type)) { if (is_string($node->type)) {