Merge pull request #11389 from tantegerda1/2.19.x

Fix psalm errors: remove override of template type
doctrine · Mar 23, 2024 · 6090141 · 6090141
2 parents e4a6c04 + c54c557
commit 6090141
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -462,9 +462,6 @@
     </RedundantConditionGivenDocblockType>
   </file>
   <file src="src/Internal/Hydration/ObjectHydrator.php">
-    <InvalidArgument>
-      <code><![CDATA[$element]]></code>
-    </InvalidArgument>
     <PossiblyFalseArgument>
       <code><![CDATA[$index]]></code>
     </PossiblyFalseArgument>

diff --git a/src/LazyCriteriaCollection.php b/src/LazyCriteriaCollection.php
@@ -76,11 +76,11 @@ public function isEmpty()
     }
 
     /**
-     * {@inheritDoc}
-     *
      * Do an optimized search of an element
      *
-     * @template TMaybeContained
+     * @param mixed $element The element to search for.
+     *
+     * @return bool TRUE if the collection contains $element, FALSE otherwise.
      */
     public function contains($element)
     {

diff --git a/src/PersistentCollection.php b/src/PersistentCollection.php
@@ -412,11 +412,6 @@ public function containsKey($key): bool
         return parent::containsKey($key);
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @template TMaybeContained
-     */
     public function contains($element): bool
     {
         if (! $this->initialized && $this->getMapping()['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY) {