doctrine · greg0ire · Jun 5, 2021 · May 31, 2021 · Jun 1, 2021
diff --git a/composer.json b/composer.json
@@ -52,6 +52,7 @@
     "autoload-dev": {
         "psr-4": {
             "Doctrine\\Tests\\": "tests/Doctrine/Tests",
+            "Doctrine\\StaticAnalysis\\": "tests/Doctrine/StaticAnalysis",
             "Doctrine\\Performance\\": "tests/Doctrine/Performance"
         }
     },

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -29,4 +29,16 @@
  */
 class ClassMetadata extends ClassMetadataInfo
 {
+    /**
+     * Repeating the ClassMetadataInfo constructor to infer correctly the template with PHPStan
+     *
+     * @see https://github.com/doctrine/orm/issues/8709
+     *
+     * @param string $entityName The name of the entity class the new instance is used for.
+     * @psalm-param class-string<T> $entityName
+     */
+    public function __construct($entityName, ?NamingStrategy $namingStrategy = null)
+    {
+        parent::__construct($entityName, $namingStrategy);
+    }
 }
diff --git a/phpstan.neon b/phpstan.neon
@@ -4,7 +4,8 @@ includes:
 parameters:
     level: 5
     paths:
-        - %currentWorkingDirectory%/lib
+        - lib
+        - tests/Doctrine/StaticAnalysis
     earlyTerminatingMethodCalls:
         Doctrine\ORM\Query\Parser:
             - syntaxError

diff --git a/psalm.xml b/psalm.xml
@@ -9,6 +9,7 @@
 >
     <projectFiles>
         <directory name="lib/Doctrine/ORM" />
+        <directory name="tests/Doctrine/StaticAnalysis" />
         <ignoreFiles>
             <directory name="vendor" />
         </ignoreFiles>

diff --git a/tests/Doctrine/StaticAnalysis/Mapping/class-metadata-constructor.php b/tests/Doctrine/StaticAnalysis/Mapping/class-metadata-constructor.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Doctrine\StaticAnalysis\Mapping;
+
+use Doctrine\ORM\Mapping\ClassMetadata;
+
+/**
+ * @template T of object
+ */
+class MetadataGenerator
+{
+    /**
+     * @psalm-param class-string<T> $entityName
+     *
+     * @psalm-return ClassMetadata<T>
+     */
+    public function createMetadata(string $entityName): ClassMetadata
+    {
+        return new ClassMetadata($entityName);
+    }
+}