Merge v1.x into v2.x (#1442)

psalm-baseline.xml

@@ -360,6 +360,9 @@
     </TooManyArguments>
   </file>
   <file src="src/Model/CollectionInfoCommandIterator.php">
+    <DeprecatedInterface>
+      <code><![CDATA[CollectionInfoCommandIterator]]></code>
+    </DeprecatedInterface>
     <MixedArrayAssignment>
       <code><![CDATA[$info['idIndex']['ns']]]></code>
     </MixedArrayAssignment>
@@ -368,6 +371,9 @@
     </MixedOperand>
   </file>
   <file src="src/Model/DatabaseInfoLegacyIterator.php">
+    <DeprecatedInterface>
+      <code><![CDATA[DatabaseInfoLegacyIterator]]></code>
+    </DeprecatedInterface>
     <MixedArgument>
       <code><![CDATA[current($this->databases)]]></code>
     </MixedArgument>
@@ -376,6 +382,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>
@@ -774,7 +785,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

@@ -38,7 +38,7 @@
 use MongoDB\Exception\UnsupportedException;
 use MongoDB\Model\BSONArray;
 use MongoDB\Model\BSONDocument;
-use MongoDB\Model\DatabaseInfoIterator;
+use MongoDB\Model\DatabaseInfo;
 use MongoDB\Operation\DropDatabase;
 use MongoDB\Operation\ListDatabaseNames;
 use MongoDB\Operation\ListDatabases;
@@ -313,7 +313,7 @@ public function listDatabaseNames(array $options = []): Iterator
      * List databases.
      *
      * @see ListDatabases::__construct() for supported options
-     * @return DatabaseInfoIterator
+     * @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

@@ -38,7 +38,6 @@
 use MongoDB\Model\BSONArray;
 use MongoDB\Model\BSONDocument;
 use MongoDB\Model\IndexInfo;
-use MongoDB\Model\IndexInfoIterator;
 use MongoDB\Operation\Aggregate;
 use MongoDB\Operation\BulkWrite;
 use MongoDB\Operation\Count;
@@ -907,7 +906,7 @@ public function insertOne(array|object $document, array $options = [])
      * Returns information for all indexes for the collection.
      *
      * @see ListIndexes::__construct() for supported options
-     * @return IndexInfoIterator
+     * @return Iterator<int, IndexInfo>
      * @throws InvalidArgumentException for parameter/option parsing errors
      * @throws DriverRuntimeException for other driver errors (e.g. connection errors)
      */

src/Database.php

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

src/Model/CollectionInfoCommandIterator.php

@@ -30,6 +30,7 @@
  * @see \MongoDB\Database::listCollections()
  * @see https://github.com/mongodb/specifications/blob/master/source/enumerate-collections.rst
  * @see https://mongodb.com/docs/manual/reference/command/listCollections/
+ * @deprecated
  * @template-extends IteratorIterator<int, array, Traversable<int, array>>
  */
 final class CollectionInfoCommandIterator extends IteratorIterator implements CollectionInfoIterator

src/Model/CollectionInfoIterator.php

@@ -26,6 +26,7 @@
  * This iterator is used for enumerating collections in a database.
  *
  * @see \MongoDB\Database::listCollections()
+ * @deprecated
  * @template-extends Iterator<int, CollectionInfo>
  */
 interface CollectionInfoIterator extends Iterator

src/Model/DatabaseInfoIterator.php

@@ -26,6 +26,7 @@
  * This iterator is used for enumerating databases on a server.
  *
  * @see \MongoDB\Client::listDatabases()
+ * @deprecated
  * @template-extends Iterator<int, DatabaseInfo>
  */
 interface DatabaseInfoIterator extends Iterator

src/Model/DatabaseInfoLegacyIterator.php

@@ -31,6 +31,7 @@
  * @internal
  * @see \MongoDB\Client::listDatabases()
  * @see https://mongodb.com/docs/manual/reference/command/listDatabases/
+ * @deprecated
  */
 final class DatabaseInfoLegacyIterator implements DatabaseInfoIterator
 {

src/Model/IndexInfo.php

@@ -93,10 +93,14 @@ public function getName()
     /**
      * Return the index namespace (e.g. "db.collection").
      *
+     * @deprecated
+     *
      * @return string
      */
     public function getNamespace()
     {
+        @trigger_error('MongoDB 4.4 drops support for the namespace in indexes, the method "IndexInfo::getNamespace()" will be removed in a future release', E_USER_DEPRECATED);
+
         return (string) $this->info['ns'];
     }
 
@@ -128,7 +132,7 @@ public function is2dSphere()
      */
     public function isGeoHaystack()
     {
-        trigger_error('MongoDB 5.0 removes support for "geoHaystack" indexes, the method "IndexInfo::isGeoHaystack()" will be removed in a future release', E_USER_DEPRECATED);
+        @trigger_error('MongoDB 5.0 removes support for "geoHaystack" indexes, the method "IndexInfo::isGeoHaystack()" will be removed in a future release', E_USER_DEPRECATED);
 
         return array_search('geoHaystack', $this->getKey(), true) !== false;
     }

src/Model/IndexInfoIterator.php

@@ -26,6 +26,7 @@
  * This iterator is used for enumerating indexes in a collection.
  *
  * @see \MongoDB\Collection::listIndexes()
+ * @deprecated
  * @template-extends Iterator<int, IndexInfo>
  */
 interface IndexInfoIterator extends Iterator

src/Model/IndexInfoIteratorIterator.php

@@ -34,6 +34,7 @@
  * @see https://github.com/mongodb/specifications/blob/master/source/enumerate-indexes.rst
  * @see https://mongodb.com/docs/manual/reference/command/listIndexes/
  * @see https://mongodb.com/docs/manual/reference/system-collections/
+ * @deprecated
  * @template-extends IteratorIterator<int, array, Traversable<int, array>>
  */
 final class IndexInfoIteratorIterator extends IteratorIterator implements IndexInfoIterator

src/Operation/ListCollections.php

@@ -17,12 +17,13 @@
 
 namespace MongoDB\Operation;
 
+use Iterator;
 use MongoDB\Command\ListCollections as ListCollectionsCommand;
 use MongoDB\Driver\Exception\RuntimeException as DriverRuntimeException;
 use MongoDB\Driver\Server;
 use MongoDB\Exception\InvalidArgumentException;
+use MongoDB\Model\CollectionInfo;
 use MongoDB\Model\CollectionInfoCommandIterator;
-use MongoDB\Model\CollectionInfoIterator;
 
 /**
  * Operation for the listCollections command.
@@ -68,7 +69,7 @@ public function __construct(private string $databaseName, array $options = [])
      * Execute the operation.
      *
      * @see Executable::execute()
-     * @return CollectionInfoIterator
+     * @return Iterator<int, CollectionInfo>
      * @throws DriverRuntimeException for other driver errors (e.g. connection errors)
      */
     public function execute(Server $server)

src/Operation/ListDatabases.php

@@ -17,12 +17,13 @@
 
 namespace MongoDB\Operation;
 
+use Iterator;
 use MongoDB\Command\ListDatabases as ListDatabasesCommand;
 use MongoDB\Driver\Exception\RuntimeException as DriverRuntimeException;
 use MongoDB\Driver\Server;
 use MongoDB\Exception\InvalidArgumentException;
 use MongoDB\Exception\UnexpectedValueException;
-use MongoDB\Model\DatabaseInfoIterator;
+use MongoDB\Model\DatabaseInfo;
 use MongoDB\Model\DatabaseInfoLegacyIterator;
 
 /**
@@ -68,7 +69,7 @@ public function __construct(array $options = [])
      * Execute the operation.
      *
      * @see Executable::execute()
-     * @return DatabaseInfoIterator
+     * @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

@@ -18,14 +18,15 @@
 namespace MongoDB\Operation;
 
 use EmptyIterator;
+use Iterator;
 use MongoDB\Driver\Command;
 use MongoDB\Driver\Exception\CommandException;
 use MongoDB\Driver\Exception\RuntimeException as DriverRuntimeException;
 use MongoDB\Driver\Server;
 use MongoDB\Driver\Session;
 use MongoDB\Exception\InvalidArgumentException;
 use MongoDB\Model\CachingIterator;
-use MongoDB\Model\IndexInfoIterator;
+use MongoDB\Model\IndexInfo;
 use MongoDB\Model\IndexInfoIteratorIterator;
 
 use function is_integer;
@@ -75,7 +76,7 @@ public function __construct(private string $databaseName, private string $collec
      * Execute the operation.
      *
      * @see Executable::execute()
-     * @return IndexInfoIterator
+     * @return Iterator<int, IndexInfo>
      * @throws DriverRuntimeException for other driver errors (e.g. connection errors)
      */
     public function execute(Server $server)