Merge pull request #718

Author: alcaeus

src/Model/IndexInfoIteratorIterator.php

@@ -18,6 +18,8 @@
 namespace MongoDB\Model;
 
 use IteratorIterator;
+use Traversable;
+use function array_key_exists;
 
 /**
  * IndexInfoIterator for both listIndexes command and legacy query results.
@@ -34,6 +36,19 @@
  */
 class IndexInfoIteratorIterator extends IteratorIterator implements IndexInfoIterator
 {
+    /** @var string|null $ns */
+    private $ns;
+
+    /**
+     * @param string|null $ns
+     */
+    public function __construct(Traversable $iterator, $ns = null)
+    {
+        parent::__construct($iterator);
+
+        $this->ns = $ns;
+    }
+
     /**
      * Return the current element as an IndexInfo instance.
      *
@@ -43,6 +58,12 @@ class IndexInfoIteratorIterator extends IteratorIterator implements IndexInfoIte
      */
     public function current()
     {
-        return new IndexInfo(parent::current());
+        $info = parent::current();
+
+        if (! array_key_exists('ns', $info) && $this->ns !== null) {
+            $info['ns'] = $this->ns;
+        }
+
+        return new IndexInfo($info);
     }
 }

src/Operation/ListIndexes.php

@@ -149,6 +149,6 @@ private function executeCommand(Server $server)
 
         $cursor->setTypeMap(['root' => 'array', 'document' => 'array']);
 
-        return new IndexInfoIteratorIterator(new CachingIterator($cursor));
+        return new IndexInfoIteratorIterator(new CachingIterator($cursor), $this->databaseName . '.' . $this->collectionName);
     }
 }

tests/Operation/ListIndexesFunctionalTest.php

@@ -31,6 +31,7 @@ public function testListIndexesForNewlyCreatedCollection()
         foreach ($indexes as $index) {
             $this->assertInstanceOf(IndexInfo::class, $index);
             $this->assertEquals(['_id' => 1], $index->getKey());
+            $this->assertSame($this->getNamespace(), $index->getNamespace());
         }
     }