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

Merge af900372b3 into 08cf1a3fd7

pull/362/merge
belazor 2017-04-24 11:32:58 +00:00 committed by GitHub
parent 08cf1a3fd7 af900372b3
commit cf3cdc56e9
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/DefinitionResolver.php
View File

@ -448,7 +448,13 @@ class DefinitionResolver
} }
$fqn = (string)($expr->getAttribute('namespacedName') ?? $expr->name) . '()'; $fqn = (string)($expr->getAttribute('namespacedName') ?? $expr->name) . '()';
$def = $this->index->getDefinition($fqn, true); $def = $this->index->getDefinition($fqn, true);
if (strtolower((string)$def) === 'null') {
return new Types\Null_;
}
if ($def !== null) { if ($def !== null) {
if ( null === $def->type ) {
return new Types\Mixed;
}
return $def->type; return $def->type;
} }
} }
@ -463,6 +469,9 @@ class DefinitionResolver
$fqn = (string)($expr->getAttribute('namespacedName') ?? $expr->name); $fqn = (string)($expr->getAttribute('namespacedName') ?? $expr->name);
$def = $this->index->getDefinition($fqn, true); $def = $this->index->getDefinition($fqn, true);
if ($def !== null) { if ($def !== null) {
if ( null === $def->type ) {
return new Types\Mixed;
}
return $def->type; return $def->type;
} }
} }