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

FIx crashes when tag doesn't have a type

pull/166/head
Felix Becker 2016-11-19 06:36:57 +01:00
parent 33211c68ca
commit c2ae7cd022
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/DefinitionResolver.php
View File

@ -585,7 +585,11 @@ class DefinitionResolver
if ($node instanceof Node\Param) {
// Parameters
$docBlock = $node->getAttribute('parentNode')->getAttribute('docBlock');
if ($docBlock !== null && count($paramTags = $docBlock->getTagsByName('param')) > 0) {
if (
$docBlock !== null
&& !empty($paramTags = $docBlock->getTagsByName('param'))
&& $paramTags[0]->getType() !== null
) {
// Use @param tag
return $paramTags[0]->getType();
}
@ -607,7 +611,11 @@ class DefinitionResolver
if ($node instanceof Node\FunctionLike) {
// Functions/methods
$docBlock = $node->getAttribute('docBlock');
if ($docBlock !== null && count($returnTags = $docBlock->getTagsByName('return')) > 0) {
if (
$docBlock !== null
&& !empty($returnTags = $docBlock->getTagsByName('return'))
&& $returnTags[0]->getType() !== null
) {
// Use @return tag
return $returnTags[0]->getType();
}
@ -625,7 +633,11 @@ class DefinitionResolver
if ($node instanceof Node\Stmt\PropertyProperty || $node instanceof Node\Const_) {
// Property or constant
$docBlock = $node->getAttribute('parentNode')->getAttribute('docBlock');
if ($docBlock !== null && count($varTags = $docBlock->getTagsByName('var')) > 0) {
if (
$docBlock !== null
&& !empty($varTags = $docBlock->getTagsByName('var'))
&& $varTags[0]->getType()
) {
// Use @var tag
return $varTags[0]->getType();
}