From d0b275b33a25f38fa8f34763951164341a9e5798 Mon Sep 17 00:00:00 2001 From: Jens Hausdorf Date: Mon, 17 Apr 2017 21:18:19 +0200 Subject: [PATCH] fix code style --- src/DefinitionResolver.php | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/src/DefinitionResolver.php b/src/DefinitionResolver.php index 17e8315..7e8b8b8 100644 --- a/src/DefinitionResolver.php +++ b/src/DefinitionResolver.php @@ -745,17 +745,13 @@ class DefinitionResolver if (is_string($node->type)) { // Resolve a string like "bool" to a type object $type = $this->typeResolver->resolve($node->type); - } else if ($node->type instanceof Node\Name) { - if (strtolower($node->type) === 'self') { - // handle self reference - $class = getClosestNode($node, Node\Stmt\Class_::class); - - if($class !== null) { - return new Types\Object_(new Fqsen('\\' . $class->name)); - } + } else if ($node->type instanceof Node\Name && strtolower($node->type) === 'self') { + // handle self reference + $class = getClosestNode($node, Node\Stmt\Class_::class); + if ($class !== null) { + return new Types\Object_(new Fqsen('\\' . $class->name)); } } - $type = new Types\Object_(new Fqsen('\\' . (string)$node->type)); } if ($node->default !== null) { $defaultType = $this->resolveExpressionNodeToType($node->default); @@ -784,16 +780,12 @@ class DefinitionResolver // Resolve a string like "bool" to a type object return $this->typeResolver->resolve($node->returnType); } - if ($node->returnType instanceof Node\Name) { - $type = (string)$node->returnType; + if ($node->returnType instanceof Node\Name && strtolower((string)$node->returnType) === 'self') { + // handle self reference + $class = getClosestNode($node, Node\Stmt\Class_::class); - if (strtolower($type) === 'self') { - // handle self reference - $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)); } } return new Types\Object_(new Fqsen('\\' . (string)$node->returnType));