Merge pull request #274 from ondrejmirtes/fix-phpstan

PHPStan already supports array-key as template type variable bound
doctrine · Jun 9, 2021 · b33e58d · b33e58d
2 parents 9491825 + f5e6f4c
commit b33e58d
Show file tree

Hide file tree

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

diff --git a/lib/Doctrine/Common/Collections/ArrayCollection.php b/lib/Doctrine/Common/Collections/ArrayCollection.php
@@ -35,7 +35,6 @@
  * serialize a collection use {@link toArray()} and reconstruct the collection
  * manually.
  *
- * @phpstan-template TKey
  * @psalm-template TKey of array-key
  * @psalm-template T
  * @template-implements Collection<TKey,T>
@@ -92,7 +91,6 @@ public function first()
      *
      * @psalm-template K of array-key
      * @psalm-template V
-     * @phpstan-template K
      *
      * @psalm-param array<K,V> $elements
      * @psalm-return static<K,V>

diff --git a/lib/Doctrine/Common/Collections/Collection.php b/lib/Doctrine/Common/Collections/Collection.php
@@ -24,7 +24,6 @@
  * position unless you explicitly positioned it before. Prefer iteration with
  * external iterators.
  *
- * @phpstan-template TKey
  * @psalm-template TKey of array-key
  * @psalm-template T
  * @template-extends IteratorAggregate<TKey, T>

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

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -10,5 +10,5 @@ parameters:
                 - 'lib/Doctrine/Common/Collections/ArrayCollection.php'
                 - 'lib/Doctrine/Common/Collections/Criteria.php'
         -
-            message: '~Array \(array\<TKey, T\>\) does not accept key int\.~'
+            message: '~Array \(array\<TKey of \(int\|string\), T\>\) does not accept key int\.~'
             path: 'lib/Doctrine/Common/Collections/ArrayCollection.php'
diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -49,5 +49,10 @@
         <RawObjectIteration errorLevel="info" />
 
         <InvalidStringClass errorLevel="info" />
+        <UnsafeGenericInstantiation>
+            <errorLevel type="suppress">
+                <file name="lib/Doctrine/Common/Collections/ArrayCollection.php"/>
+            </errorLevel>
+        </UnsafeGenericInstantiation>
     </issueHandlers>
 </psalm>