Adjust phpstan entity relation type from Entity -> Entity|null

xfrocks · Oct 1, 2018 · 8df702e · 8df702e
1 parent ef1a5ec
commit 8df702e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Cli/Command/AutoGen.php b/Cli/Command/AutoGen.php
@@ -19,7 +19,7 @@ class AutoGen extends Command
 
     const MARKER_BEGINS = '// DevHelper/Autogen begins';
     const MARKER_ENDS = '// DevHelper/Autogen ends';
-    const VERSION_ID = 2018092102;
+    const VERSION_ID = 2018100101;
 
     protected $devHelperDirPath;
 

diff --git a/PHPStan/Reflection/EntityRelationReflection.php b/PHPStan/Reflection/EntityRelationReflection.php
@@ -6,8 +6,10 @@
 use PHPStan\Reflection\PropertyReflection;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\IntegerType;
+use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
+use PHPStan\Type\UnionType;
 use XF\Mvc\Entity\Entity;
 
 class EntityRelationReflection implements PropertyReflection
@@ -59,7 +61,7 @@ public function getType(): Type
         $className = str_replace(':', '\Entity\\', $this->entity);
 
         if ($this->type === Entity::TO_ONE) {
-            return new ObjectType($className);
+            return new UnionType([new NullType(), new ObjectType($className)]);
         } else {
             return new ArrayType(new IntegerType(), new ObjectType($className));
         }