Resolve ObjectRepository<T> as a ObjectRepository<object>

Author: pepakriz

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,9 +49,7 @@ public function getTypeFromMethodCall(
 	): Type
 	{
 		if (count($methodCall->args) === 0) {
-			return ParametersAcceptorSelector::selectSingle(
-				$methodReflection->getVariants()
-			)->getReturnType();
+			return $this->getDefaultReturnType($methodReflection);
 		}
 		$argType = $scope->getType($methodCall->args[0]->value);
 		if ($argType instanceof ConstantStringType) {
@@ -59,16 +58,12 @@ public function getTypeFromMethodCall(
 		} elseif ($argType instanceof GenericClassStringType) {
 			$classType = $argType->getGenericType();
 			if (!$classType instanceof TypeWithClassName) {
-				return ParametersAcceptorSelector::selectSingle(
-					$methodReflection->getVariants()
-				)->getReturnType();
+				return $this->getDefaultReturnType($methodReflection);
 			}
 
 			$objectName = $classType->getClassName();
 		} else {
-			return ParametersAcceptorSelector::selectSingle(
-				$methodReflection->getVariants()
-			)->getReturnType();
+			return $this->getDefaultReturnType($methodReflection);
 		}
 
 		$repositoryClass = $this->metadataResolver->getRepositoryClass($objectName);
@@ -78,4 +73,17 @@ public function getTypeFromMethodCall(
 		]);
 	}
 
+	private function getDefaultReturnType(MethodReflection $methodReflection): Type
+	{
+		$type = ParametersAcceptorSelector::selectSingle(
+			$methodReflection->getVariants()
+		)->getReturnType();
+
+		if ($type instanceof GenericObjectType) {
+			$type = new GenericObjectType($type->getClassName(), [new ObjectWithoutClassType()]);
+		}
+
+		return $type;
+	}
+
 }

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

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

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

@@ -0,0 +1,7 @@
+[
+    {
+        "message": "Call to an undefined method object::unknownMethod().",
+        "line": 71,
+        "ignorable": true
+    }
+]

tests/DoctrineIntegration/ORM/data/entityManagerDynamicReturn.php

@@ -62,6 +62,13 @@ public function doSomethingWithRepository(string $entityName): void
 		$repository = $this->entityManager->getRepository($entityName);
 		$repository->getClassName();
 		$repository->unknownMethod();
+		$entity = $repository->find(1);
+
+		if ($entity === null) {
+			throw new RuntimeException('Sorry, but no...');
+		}
+
+		$entity->unknownMethod();
 	}
 }