Use templated return type

Author: alcaeus

psalm-baseline.xml

@@ -150,6 +150,9 @@
     </TooManyArguments>
   </file>
   <file src="src/Model/CollectionInfoCommandIterator.php">
+    <DeprecatedInterface>
+      <code><![CDATA[CollectionInfoCommandIterator]]></code>
+    </DeprecatedInterface>
     <MixedArrayAssignment>
       <code><![CDATA[$info['idIndex']['ns']]]></code>
     </MixedArrayAssignment>
@@ -158,6 +161,9 @@
     </MixedOperand>
   </file>
   <file src="src/Model/DatabaseInfoLegacyIterator.php">
+    <DeprecatedInterface>
+      <code><![CDATA[DatabaseInfoLegacyIterator]]></code>
+    </DeprecatedInterface>
     <MixedArgument>
       <code><![CDATA[current($this->databases)]]></code>
     </MixedArgument>
@@ -166,6 +172,11 @@
       <code><![CDATA[key($this->databases)]]></code>
     </MixedReturnTypeCoercion>
   </file>
+  <file src="src/Model/IndexInfoIteratorIterator.php">
+    <DeprecatedInterface>
+      <code><![CDATA[IndexInfoIteratorIterator]]></code>
+    </DeprecatedInterface>
+  </file>
   <file src="src/Model/IndexInput.php">
     <LessSpecificReturnStatement>
       <code><![CDATA[(object) $this->index]]></code>
@@ -553,7 +564,22 @@
       <code><![CDATA[$document]]></code>
     </PossiblyInvalidArgument>
   </file>
+  <file src="src/Operation/ListCollections.php">
+    <DeprecatedClass>
+      <code><![CDATA[new CollectionInfoCommandIterator($this->listCollections->execute($server), $this->databaseName)]]></code>
+    </DeprecatedClass>
+  </file>
+  <file src="src/Operation/ListDatabases.php">
+    <DeprecatedClass>
+      <code><![CDATA[new DatabaseInfoLegacyIterator($this->listDatabases->execute($server))]]></code>
+    </DeprecatedClass>
+  </file>
   <file src="src/Operation/ListIndexes.php">
+    <DeprecatedClass>
+      <code><![CDATA[IndexInfoIteratorIterator]]></code>
+      <code><![CDATA[new IndexInfoIteratorIterator($iterator, $this->databaseName . '.' . $this->collectionName)]]></code>
+      <code><![CDATA[new IndexInfoIteratorIterator(new EmptyIterator())]]></code>
+    </DeprecatedClass>
     <MixedAssignment>
       <code><![CDATA[$cmd[$option]]]></code>
       <code><![CDATA[$options['session']]]></code>

src/Client.php

@@ -33,6 +33,7 @@
 use MongoDB\Exception\UnsupportedException;
 use MongoDB\Model\BSONArray;
 use MongoDB\Model\BSONDocument;
+use MongoDB\Model\DatabaseInfo;
 use MongoDB\Operation\DropDatabase;
 use MongoDB\Operation\ListDatabaseNames;
 use MongoDB\Operation\ListDatabases;
@@ -293,7 +294,7 @@ public function listDatabaseNames(array $options = []): Iterator
      * List databases.
      *
      * @see ListDatabases::__construct() for supported options
-     * @return Iterator
+     * @return Iterator<int, DatabaseInfo>
      * @throws UnexpectedValueException if the command response was malformed
      * @throws InvalidArgumentException for parameter/option parsing errors
      * @throws DriverRuntimeException for other driver errors (e.g. connection errors)

src/Collection.php

@@ -881,7 +881,7 @@ public function insertOne($document, array $options = [])
      * Returns information for all indexes for the collection.
      *
      * @see ListIndexes::__construct() for supported options
-     * @return Iterator
+     * @return Iterator<int, IndexInfo>
      * @throws InvalidArgumentException for parameter/option parsing errors
      * @throws DriverRuntimeException for other driver errors (e.g. connection errors)
      */

src/Database.php

@@ -32,6 +32,7 @@
 use MongoDB\GridFS\Bucket;
 use MongoDB\Model\BSONArray;
 use MongoDB\Model\BSONDocument;
+use MongoDB\Model\CollectionInfo;
 use MongoDB\Operation\Aggregate;
 use MongoDB\Operation\CreateCollection;
 use MongoDB\Operation\CreateEncryptedCollection;
@@ -472,7 +473,7 @@ public function listCollectionNames(array $options = []): Iterator
      * Returns information for all collections in this database.
      *
      * @see ListCollections::__construct() for supported options
-     * @return Iterator
+     * @return Iterator<int, CollectionInfo>
      * @throws InvalidArgumentException for parameter/option parsing errors
      * @throws DriverRuntimeException for other driver errors (e.g. connection errors)
      */

src/Operation/ListCollections.php

@@ -22,6 +22,7 @@
 use MongoDB\Driver\Exception\RuntimeException as DriverRuntimeException;
 use MongoDB\Driver\Server;
 use MongoDB\Exception\InvalidArgumentException;
+use MongoDB\Model\CollectionInfo;
 use MongoDB\Model\CollectionInfoCommandIterator;
 
 /**
@@ -71,7 +72,7 @@ public function __construct(string $databaseName, array $options = [])
      * Execute the operation.
      *
      * @see Executable::execute()
-     * @return Iterator
+     * @return Iterator<int, CollectionInfo>
      * @throws DriverRuntimeException for other driver errors (e.g. connection errors)
      */
     public function execute(Server $server)

src/Operation/ListDatabases.php

@@ -23,6 +23,7 @@
 use MongoDB\Driver\Server;
 use MongoDB\Exception\InvalidArgumentException;
 use MongoDB\Exception\UnexpectedValueException;
+use MongoDB\Model\DatabaseInfo;
 use MongoDB\Model\DatabaseInfoLegacyIterator;
 
 /**
@@ -68,7 +69,7 @@ public function __construct(array $options = [])
      * Execute the operation.
      *
      * @see Executable::execute()
-     * @return Iterator
+     * @return Iterator<int, DatabaseInfo>
      * @throws UnexpectedValueException if the command response was malformed
      * @throws DriverRuntimeException for other driver errors (e.g. connection errors)
      */

src/Operation/ListIndexes.php

@@ -26,6 +26,7 @@
 use MongoDB\Driver\Session;
 use MongoDB\Exception\InvalidArgumentException;
 use MongoDB\Model\CachingIterator;
+use MongoDB\Model\IndexInfo;
 use MongoDB\Model\IndexInfoIteratorIterator;
 
 use function is_integer;
@@ -85,7 +86,7 @@ public function __construct(string $databaseName, string $collectionName, array
      * Execute the operation.
      *
      * @see Executable::execute()
-     * @return Iterator
+     * @return Iterator<int, IndexInfo>
      * @throws DriverRuntimeException for other driver errors (e.g. connection errors)
      */
     public function execute(Server $server)