Merge pull request #47 from orklah/template-typeof

Replace template-typeof
psalm · Jan 19, 2020 · f962d9e · f962d9e
2 parents f8ba5da + 28a7a9a
commit f962d9e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 25 deletions.
diff --git a/stubs/EntityManager.php b/stubs/EntityManager.php
@@ -5,38 +5,35 @@
 class EntityManager implements EntityManagerInterface
 {
     /**
-     * @param class-string $entityName
+     * @param class-string<T> $entityName
      *
      * @return EntityRepository<T>
      *
      * @template T
-     * @template-typeof T $entityName
      */
     public function getRepository(string $entityName)
     {
     }
 
     /**
-     * @param class-string $entityName
-     * @param mixed        $id
+     * @param class-string<T> $entityName
+     * @param mixed           $id
      *
      * @return ?T
      *
      * @template T
-     * @template-typeof T $entityName
      */
     public function find(string $entityName, $id, ?int $lockMode = null, ?int $lockVersion = null)
     {
     }
 
     /**
-     * @param class-string $entityName
-     * @param mixed        $id
+     * @param class-string<T> $entityName
+     * @param mixed           $id
      *
      * @return T
      *
      * @template T
-     * @template-typeof T $entityName
      */
     public function getReference(string $entityName, $id)
     {

diff --git a/stubs/EntityManagerInterface.php b/stubs/EntityManagerInterface.php
@@ -7,34 +7,31 @@
 interface EntityManagerInterface extends ObjectManager
 {
     /**
-     * @param class-string $entityName
+     * @param class-string<T> $entityName
      *
      * @return EntityRepository<T>
      *
      * @template T
-     * @template-typeof T $entityName
      */
     public function getRepository(string $entityName);
 
     /**
-     * @param class-string $entityName
-     * @param mixed        $id
+     * @param class-string<T> $entityName
+     * @param mixed           $id
      *
      * @return ?T
      *
      * @template T
-     * @template-typeof T $entityName
      */
     public function find(string $entityName, $id, ?int $lockMode = null, ?int $lockVersion = null);
 
     /**
-     * @param class-string $entityName
-     * @param mixed        $id
+     * @param class-string<T> $entityName
+     * @param mixed           $id
      *
      * @return T
      *
      * @template T
-     * @template-typeof T $entityName
      */
     public function getReference(string $entityName, $id);
 }
diff --git a/stubs/ObjectManager.php b/stubs/ObjectManager.php
@@ -5,32 +5,29 @@
 interface ObjectManager
 {
     /**
-     * @param class-string $className
+     * @param class-string<T> $className
      *
      * @return ObjectRepository<T>
      *
      * @template T
-     * @template-typeof T $className
      */
     public function getRepository(string $className);
 
     /**
-     * @param class-string $className
+     * @param class-string<T> $className
      *
      * @return Mapping\ClassMetadata<T>
      *
      * @template T
-     * @template-typeof T $className
      */
     public function getClassMetadata(string $className);
 
     /**
-     * @param class-string $className
+     * @param class-string<T> $className
      *
      * @return ?T
      *
      * @template T
-     * @template-typeof T $className
      */
     public function find(string $className, $id);
 }
diff --git a/tests/acceptance/EntityRepository.feature b/tests/acceptance/EntityRepository.feature
@@ -25,7 +25,7 @@ Feature: EntityRepository
 
       /**
        * @template T
-       * @template-typeof T $entityClass
+       * @param class-string<T> $entityClass
        * @psalm-suppress InvalidReturnType
        * @return EntityRepository<T>
        */

diff --git a/tests/acceptance/Paginator.feature b/tests/acceptance/Paginator.feature
@@ -25,8 +25,7 @@ Feature: Paginator
 
           /**
            * @template T
-           * @template-typeof T $type
-           * @param class-string $type
+           * @param class-string<T> $type
            * @return Paginator<T>
            * @psalm-suppress InvalidReturnType
            */