Merge pull request #171 from franmomu/classmetadata_generic

Make Classmetadata generic
doctrine · Apr 24, 2021 · ffeaf9d · ffeaf9d
2 parents e2d6be1 + 95405e2
commit ffeaf9d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/lib/Doctrine/Persistence/Mapping/ClassMetadata.php b/lib/Doctrine/Persistence/Mapping/ClassMetadata.php
@@ -6,14 +6,16 @@
 
 /**
  * Contract for a Doctrine persistence layer ClassMetadata class to implement.
+ *
+ * @template T of object
  */
 interface ClassMetadata
 {
     /**
      * Gets the fully-qualified class name of this persistent class.
      *
      * @return string
-     * @psalm-return class-string
+     * @psalm-return class-string<T>
      */
     public function getName();
 
@@ -29,7 +31,7 @@ public function getIdentifier();
     /**
      * Gets the ReflectionClass instance for this mapped class.
      *
-     * @return ReflectionClass
+     * @return ReflectionClass<T>
      */
     public function getReflectionClass();
 

diff --git a/lib/Doctrine/Persistence/Mapping/ClassMetadataFactory.php b/lib/Doctrine/Persistence/Mapping/ClassMetadataFactory.php
@@ -43,6 +43,8 @@ public function hasMetadataFor($className);
      * @param string        $className
      * @param ClassMetadata $class
      * @psalm-param T $class
+     *
+     * @return void
      */
     public function setMetadataFor($className, $class);
 

diff --git a/lib/Doctrine/Persistence/ObjectManager.php b/lib/Doctrine/Persistence/ObjectManager.php
@@ -131,8 +131,12 @@ public function getRepository($className);
      * (as it is returned by get_class($obj)).
      *
      * @param string $className
+     * @psalm-param class-string<T> $className
      *
      * @return ClassMetadata
+     * @psalm-return ClassMetadata<T>
+     *
+     * @template T of object
      */
     public function getClassMetadata($className);
 

diff --git a/tests/Doctrine/Tests/Persistence/Mapping/Fixtures/TestClassMetadata.php b/tests/Doctrine/Tests/Persistence/Mapping/Fixtures/TestClassMetadata.php
@@ -8,25 +8,26 @@
 use LogicException;
 use ReflectionClass;
 
+/**
+ * @template T of object
+ * @implements ClassMetadata<T>
+ */
 final class TestClassMetadata implements ClassMetadata
 {
     /**
      * @var string
-     * @psalm-var class-string
+     * @psalm-var class-string<T>
      */
     private $className;
 
     /**
-     * @psalm-param class-string $className
+     * @psalm-param class-string<T> $className
      */
     public function __construct(string $className)
     {
         $this->className = $className;
     }
 
-    /**
-     * @psalm-return class-string
-     */
     public function getName(): string
     {
         return $this->className;