Repository should always respect the base repositoryClass from configuration

Author: ondrejmirtes

src/Type/Doctrine/GetRepositoryDynamicReturnTypeExtension.php

@@ -10,6 +10,7 @@
 use PHPStan\Type\Generic\GenericClassStringType;
 use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\ObjectType;
+use PHPStan\Type\ObjectWithoutClassType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeWithClassName;
 
@@ -48,7 +49,10 @@ public function getTypeFromMethodCall(
 	): Type
 	{
 		if (count($methodCall->args) === 0) {
-			return $this->getDefaultReturnType($scope, $methodCall->args, $methodReflection);
+			return new GenericObjectType(
+				$this->metadataResolver->getResolvedRepositoryClass(),
+				[new ObjectWithoutClassType()]
+			);
 		}
 		$argType = $scope->getType($methodCall->args[0]->value);
 		if ($argType instanceof ConstantStringType) {
@@ -57,7 +61,10 @@ public function getTypeFromMethodCall(
 		} elseif ($argType instanceof GenericClassStringType) {
 			$classType = $argType->getGenericType();
 			if (!$classType instanceof TypeWithClassName) {
-				return $this->getDefaultReturnType($scope, $methodCall->args, $methodReflection);
+				return new GenericObjectType(
+					$this->metadataResolver->getResolvedRepositoryClass(),
+					[$classType]
+				);
 			}
 
 			$objectName = $classType->getClassName();
@@ -84,11 +91,19 @@ public function getTypeFromMethodCall(
 	 */
 	private function getDefaultReturnType(Scope $scope, array $args, MethodReflection $methodReflection): Type
 	{
-		return ParametersAcceptorSelector::selectFromArgs(
+		$defaultType = ParametersAcceptorSelector::selectFromArgs(
 			$scope,
 			$args,
 			$methodReflection->getVariants()
 		)->getReturnType();
+		if ($defaultType instanceof GenericObjectType && count($defaultType->getTypes()) > 0) {
+			return new GenericObjectType(
+				$this->metadataResolver->getResolvedRepositoryClass(),
+				[$defaultType->getTypes()[0]]
+			);
+		}
+
+		return $defaultType;
 	}
 
 }

src/Type/Doctrine/ObjectMetadataResolver.php

@@ -70,7 +70,7 @@ private function loadObjectManager(string $objectManagerLoader): ?ObjectManager
 		return require $objectManagerLoader;
 	}
 
-	private function getResolvedRepositoryClass(): string
+	public function getResolvedRepositoryClass(): string
 	{
 		if ($this->resolvedRepositoryClass !== null) {
 			return $this->resolvedRepositoryClass;

tests/DoctrineIntegration/ORM/data/entityManagerDynamicReturn-2.json

@@ -15,7 +15,7 @@
         "ignorable": true
     },
     {
-        "message": "Call to an undefined method Doctrine\\Persistence\\ObjectRepository<object>::unknownMethod().",
+        "message": "Call to an undefined method Doctrine\\ORM\\EntityRepository<object>::unknownMethod().",
         "line": 64,
         "ignorable": true
     }