From af900372b36108c958daa144b896a4e72e0308b6 Mon Sep 17 00:00:00 2001
From: Fillip Hannisdal <fillip@dragonbyte-tech.com>
Date: Sat, 22 Apr 2017 16:51:01 +0100
Subject: [PATCH] Fix for #286

---
 src/DefinitionResolver.php | 9 +++++++++
 1 file changed, 9 insertions(+)

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