MockObjectTypeNodeResolverExtension - prioritize UnionType of MockObj…

…ect|Foo if the intersection is NeverType
phpstan · Apr 13, 2020 · 3e823ff · 3e823ff
1 parent e4552ce
commit 3e823ff
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/PhpDoc/PHPUnit/MockObjectTypeNodeResolverExtension.php b/src/PhpDoc/PHPUnit/MockObjectTypeNodeResolverExtension.php
@@ -7,6 +7,7 @@
 use PHPStan\PhpDoc\TypeNodeResolverExtension;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\PhpDocParser\Ast\Type\UnionTypeNode;
+use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeWithClassName;
 
@@ -44,7 +45,10 @@ public function resolve(TypeNode $typeNode, \PHPStan\Analyser\NameScope $nameSco
 			}
 
 			if (array_key_exists($type->getClassName(), $mockClassNames)) {
-				return \PHPStan\Type\TypeCombinator::intersect(...$types);
+				$resultType = \PHPStan\Type\TypeCombinator::intersect(...$types);
+				if (!$resultType instanceof NeverType) {
+					return $resultType;
+				}
 			}
 		}