Dynamic return type for EntityManager#merge

phpstan · Dec 1, 2017 · b56955f · b56955f
1 parent af4cb66
commit b56955f
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/Type/Doctrine/EntityManagerGetRepositoryDynamicReturnTypeExtension.php b/src/Type/Doctrine/EntityManagerGetRepositoryDynamicReturnTypeExtension.php
@@ -27,7 +27,8 @@ public function getClass(): string
 
 	public function isMethodSupported(MethodReflection $methodReflection): bool
 	{
-		return $methodReflection->getName() === 'getRepository';
+		return $methodReflection->getName() === 'getRepository' ||
+			$methodReflection->getName() === 'merge';
 	}
 
 	public function getTypeFromMethodCall(
@@ -39,6 +40,11 @@ public function getTypeFromMethodCall(
 		if (count($methodCall->args) === 0) {
 			return $methodReflection->getReturnType();
 		}
+
+		if ($methodReflection->getName() === 'merge') {
+			return $scope->getType($methodCall->args[0]->value);
+		}
+
 		$arg = $methodCall->args[0]->value;
 		if (!($arg instanceof \PhpParser\Node\Expr\ClassConstFetch)) {
 			return $methodReflection->getReturnType();