Dynamic return type for EntityManager#merge

Stefan Siegl · Stefan Siegl · commit b56955f21d17 · 2017-12-01T13:51:33.000+01:00
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();

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ public function getClass(): string`
`27`	`27`
`28`	`28`	`public function isMethodSupported(MethodReflection $methodReflection): bool`
`29`	`29`	`{`
`30`		`- return $methodReflection->getName() === 'getRepository';`
	`30`	`+ return $methodReflection->getName() === 'getRepository' \|\|`
	`31`	`+ $methodReflection->getName() === 'merge';`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`public function getTypeFromMethodCall(`
`@@ -39,6 +40,11 @@ public function getTypeFromMethodCall(`
`39`	`40`	`if (count($methodCall->args) === 0) {`
`40`	`41`	`return $methodReflection->getReturnType();`
`41`	`42`	`}`
	`43`	`+`
	`44`	`+ if ($methodReflection->getName() === 'merge') {`
	`45`	`+ return $scope->getType($methodCall->args[0]->value);`
	`46`	`+ }`
	`47`	`+`
`42`	`48`	`$arg = $methodCall->args[0]->value;`
`43`	`49`	`if (!($arg instanceof \PhpParser\Node\Expr\ClassConstFetch)) {`
`44`	`50`	`return $methodReflection->getReturnType();`