Merge pull request #186 from muglug/psalm-template

Use @psalm-template annotation to avoid clashes
doctrine · Mar 25, 2019 · 0852fa2 · 0852fa2
2 parents 6453eec + 807e6da
commit 0852fa2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/lib/Doctrine/Common/Collections/AbstractLazyCollection.php b/lib/Doctrine/Common/Collections/AbstractLazyCollection.php
@@ -7,8 +7,8 @@
 /**
  * Lazy collection that is backed by a concrete collection
  *
- * @template TKey of array-key
- * @template T
+ * @psalm-template TKey of array-key
+ * @psalm-template T
  * @template-implements Collection<TKey,T>
  */
 abstract class AbstractLazyCollection implements Collection

diff --git a/lib/Doctrine/Common/Collections/ArrayCollection.php b/lib/Doctrine/Common/Collections/ArrayCollection.php
@@ -32,8 +32,8 @@
  * serialize a collection use {@link toArray()} and reconstruct the collection
  * manually.
  *
- * @template TKey of array-key
- * @template T
+ * @psalm-template TKey of array-key
+ * @psalm-template T
  * @template-implements Collection<TKey,T>
  * @template-implements Selectable<TKey,T>
  */

diff --git a/lib/Doctrine/Common/Collections/Collection.php b/lib/Doctrine/Common/Collections/Collection.php
@@ -24,8 +24,8 @@
  * position unless you explicitly positioned it before. Prefer iteration with
  * external iterators.
  *
- * @template TKey of array-key
- * @template T
+ * @psalm-template TKey of array-key
+ * @psalm-template T
  * @template-extends IteratorAggregate<TKey, T>
  * @template-extends ArrayAccess<TKey|null, T>
  */
@@ -243,7 +243,7 @@ public function forAll(Closure $p);
      *
      * @return Collection
      *
-     * @template U
+     * @psalm-template U
      * @psalm-param Closure(T=):U $func
      * @psalm-return Collection<TKey, U>
      */

diff --git a/lib/Doctrine/Common/Collections/Selectable.php b/lib/Doctrine/Common/Collections/Selectable.php
@@ -14,8 +14,8 @@
  * this API can implement efficient database access without having to ask the
  * EntityManager or Repositories.
  *
- * @template TKey as array-key
- * @template T
+ * @psalm-template TKey as array-key
+ * @psalm-template T
  */
 interface Selectable
 {