Fix static analysis errors

doctrine · Nov 24, 2023 · 4342efe · 4342efe
1 parent f427c3d
commit 4342efe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php b/lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php
@@ -29,9 +29,11 @@
 use Doctrine\ODM\MongoDB\Utility\CollectionHelper;
 use Doctrine\Persistence\Mapping\MappingException;
 use InvalidArgumentException;
+use Iterator as SplIterator;
 use MongoDB\BSON\ObjectId;
 use MongoDB\Collection;
 use MongoDB\Driver\Cursor;
+use MongoDB\Driver\CursorInterface;
 use MongoDB\Driver\Exception\Exception as DriverException;
 use MongoDB\Driver\Exception\WriteException;
 use MongoDB\Driver\WriteConcern;
@@ -581,7 +583,7 @@ private function getShardKeyQuery(object $document): array
     /**
      * Wraps the supplied base cursor in the corresponding ODM class.
      */
-    private function wrapCursor(Cursor $baseCursor): Iterator
+    private function wrapCursor(SplIterator&CursorInterface $baseCursor): Iterator
     {
         return new CachingIterator(new HydratingIterator($baseCursor, $this->dm->getUnitOfWork(), $this->class));
     }

diff --git a/lib/Doctrine/ODM/MongoDB/Types/Type.php b/lib/Doctrine/ODM/MongoDB/Types/Type.php
@@ -257,8 +257,7 @@ public static function getTypesMap(): array
         return self::$typesMap;
     }
 
-    /** @return string */
-    public function __toString()
+    public function __toString(): string
     {
         $e         = explode('\\', static::class);
         $className = end($e);

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -279,11 +279,6 @@
       <code>$datetime instanceof DateTime</code>
     </RedundantCondition>
   </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Types/Type.php">
-    <MethodSignatureMustProvideReturnType>
-      <code>__toString</code>
-    </MethodSignatureMustProvideReturnType>
-  </file>
   <file src="lib/Doctrine/ODM/MongoDB/UnitOfWork.php">
     <InvalidArgument>
       <code>$assoc</code>