From 026a86acc87b4a07d6ea2142feac76d9ae290f74 Mon Sep 17 00:00:00 2001
From: Matthew Brown <github@muglug.com>
Date: Fri, 17 Feb 2017 19:04:43 -0500
Subject: [PATCH] Fix return types

---
 src/DefinitionResolver.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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