Fix build

Author: ondrejmirtes

composer.json

@@ -7,7 +7,7 @@
 	],
 	"require": {
 		"php": "^7.2 || ^8.0",
-		"phpstan/phpstan": "^1.8.11"
+		"phpstan/phpstan": "^1.9.7"
 	},
 	"conflict": {
 		"doctrine/collections": "<1.0",

src/Doctrine/Mapping/ClassMetadataFactory.php

@@ -53,8 +53,9 @@ protected function initialize(): void
 	}
 
 	/**
-	 * @param string $className
-	 * @return ClassMetadata
+	 * @template T of object
+	 * @param class-string<T> $className
+	 * @return ClassMetadata<T>
 	 */
 	protected function newClassMetadataInstance($className)
 	{

src/Rules/Doctrine/ORM/PropertiesExtension.php

@@ -83,6 +83,9 @@ public function isInitialized(PropertyReflection $property, string $propertyName
 		return $metadata->isReadOnly && !$declaringClass->hasConstructor();
 	}
 
+	/**
+	 * @param ClassMetadataInfo<object> $metadata
+	 */
 	private function isGeneratedIdentifier(ClassMetadataInfo $metadata, string $propertyName): bool
 	{
 		if ($metadata->isIdentifierNatural()) {

src/Type/Doctrine/ObjectMetadataResolver.php

@@ -24,7 +24,7 @@ final class ObjectMetadataResolver
 	/** @var ObjectManager|false|null */
 	private $objectManager;
 
-	/** @var ClassMetadataFactory<ClassMetadata>|null */
+	/** @var ClassMetadataFactory<ClassMetadata<object>>|null */
 	private $metadataFactory;
 
 	public function __construct(
@@ -89,7 +89,7 @@ public function isTransient(string $className): bool
 	}
 
 	/**
-	 * @return ClassMetadataFactory<ClassMetadata>
+	 * @return ClassMetadataFactory<ClassMetadata<object>>
 	 */
 	private function getMetadataFactory(): ?ClassMetadataFactory
 	{
@@ -101,6 +101,7 @@ private function getMetadataFactory(): ?ClassMetadataFactory
 			return null;
 		}
 
+		/** @var ClassMetadataFactory<ClassMetadata<object>> $metadataFactory */
 		$metadataFactory = new \PHPStan\Doctrine\Mapping\ClassMetadataFactory();
 
 		return $this->metadataFactory = $metadataFactory;

src/Type/Doctrine/Query/QueryResultTypeWalker.php

@@ -1290,7 +1290,10 @@ private function isQueryComponentNullable(string $dqlAlias): bool
 		return $this->nullableQueryComponents[$dqlAlias] ?? false;
 	}
 
-	/** @return array{string, ?class-string<BackedEnum>} Doctrine type name and enum type of field */
+	/**
+	 * @param ClassMetadataInfo<object> $class
+	 * @return array{string, ?class-string<BackedEnum>} Doctrine type name and enum type of field
+	 */
 	private function getTypeOfField(ClassMetadataInfo $class, string $fieldName): array
 	{
 		assert(isset($class->fieldMappings[$fieldName]));

tests/DoctrineIntegration/ORM/data/queryBuilder-6.json

@@ -0,0 +1,17 @@
+[
+    {
+        "message": "Method PHPStan\\DoctrineIntegration\\ORM\\QueryBuilder\\Foo::doFoo() return type with generic class Doctrine\\ORM\\Query does not specify its types: TResult",
+        "line": 22,
+        "ignorable": true
+    },
+    {
+        "message": "Method PHPStan\\DoctrineIntegration\\ORM\\QueryBuilder\\Foo::doBar() return type with generic class Doctrine\\ORM\\Query does not specify its types: TResult",
+        "line": 35,
+        "ignorable": true
+    },
+    {
+        "message": "Method PHPStan\\DoctrineIntegration\\ORM\\QueryBuilder\\Foo::dynamicQueryBuilder() return type with generic class Doctrine\\ORM\\Query does not specify its types: TResult",
+        "line": 50,
+        "ignorable": true
+    }
+]