PHPLIB-1522: Deprecate info iterators

src/Client.php

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

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

src/Database.php

@@ -32,7 +32,6 @@
 use MongoDB\GridFS\Bucket;
 use MongoDB\Model\BSONArray;
 use MongoDB\Model\BSONDocument;
-use MongoDB\Model\CollectionInfoIterator;
 use MongoDB\Operation\Aggregate;
 use MongoDB\Operation\CreateCollection;
 use MongoDB\Operation\CreateEncryptedCollection;
@@ -473,7 +472,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
      * @throws InvalidArgumentException for parameter/option parsing errors
      * @throws DriverRuntimeException for other driver errors (e.g. connection errors)
      */

src/Model/CollectionInfoCommandIterator.php

@@ -30,9 +30,10 @@
  * @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>>
  */
 class CollectionInfoCommandIterator extends IteratorIterator implements CollectionInfoIterator
 {
     private ?string $databaseName = null;
 

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,8 +31,9 @@
  * @internal
  * @see \MongoDB\Client::listDatabases()
  * @see https://mongodb.com/docs/manual/reference/command/listDatabases/
+ * @deprecated
  */
 class DatabaseInfoLegacyIterator implements DatabaseInfoIterator
 {
     private array $databases;
 

src/Model/IndexInfo.php

@@ -96,10 +96,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'];
     }
 
@@ -131,7 +135,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,9 +34,10 @@
  * @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>>
  */
 class IndexInfoIteratorIterator extends IteratorIterator implements IndexInfoIterator
 {
     private ?string $ns = null;
 

src/Operation/ListCollections.php

@@ -17,12 +17,12 @@
 
 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\CollectionInfoCommandIterator;
-use MongoDB\Model\CollectionInfoIterator;
 
 /**
  * Operation for the listCollections command.
@@ -71,7 +71,7 @@ public function __construct(string $databaseName, array $options = [])
      * Execute the operation.
      *
      * @see Executable::execute()
-     * @return CollectionInfoIterator
+     * @return Iterator
      * @throws DriverRuntimeException for other driver errors (e.g. connection errors)
      */
     public function execute(Server $server)

src/Operation/ListDatabases.php

@@ -17,12 +17,12 @@
 
 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\DatabaseInfoLegacyIterator;
 
 /**
@@ -68,7 +68,7 @@ public function __construct(array $options = [])
      * Execute the operation.
      *
      * @see Executable::execute()
-     * @return DatabaseInfoIterator
+     * @return Iterator
      * @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,14 @@
 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\IndexInfoIteratorIterator;
 
 use function is_integer;
@@ -85,7 +85,7 @@ public function __construct(string $databaseName, string $collectionName, array
      * Execute the operation.
      *
      * @see Executable::execute()
-     * @return IndexInfoIterator
+     * @return Iterator
      * @throws DriverRuntimeException for other driver errors (e.g. connection errors)
      */
     public function execute(Server $server)