Merge pull request #23

Author: jmikola

src/Operation/Count.php

@@ -85,7 +85,7 @@ public function __construct($databaseName, $collectionName, array $filter = arra
     public function execute(Server $server)
     {
         $cursor = $server->executeCommand($this->databaseName, $this->createCommand());
-        $cursor->setTypeMap(array('document' => 'array'));
+        $cursor->setTypeMap(array('root' => 'array', 'document' => 'array'));
         $result = current($cursor->toArray());
 
         if (empty($result['ok'])) {

src/Operation/CreateIndexes.php

@@ -91,7 +91,7 @@ private function executeCommand(Server $server)
         ));
 
         $cursor = $server->executeCommand($this->databaseName, $command);
-        $cursor->setTypeMap(array('document' => 'array'));
+        $cursor->setTypeMap(array('root' => 'array', 'document' => 'array'));
         $result = current($cursor->toArray());
 
         if (empty($result['ok'])) {

src/Operation/ListCollections.php

@@ -85,7 +85,7 @@ private function executeCommand(Server $server)
         }
 
         $cursor = $server->executeCommand($this->databaseName, new Command($cmd));
-        $cursor->setTypeMap(array('document' => 'array'));
+        $cursor->setTypeMap(array('root' => 'array', 'document' => 'array'));
 
         return new CollectionInfoCommandIterator($cursor);
     }
@@ -115,7 +115,7 @@ private function executeLegacy(Server $server)
             : array();
 
         $cursor = $server->executeQuery($this->databaseName . '.system.namespaces', new Query($filter, $options));
-        $cursor->setTypeMap(array('document' => 'array'));
+        $cursor->setTypeMap(array('root' => 'array', 'document' => 'array'));
 
         return new CollectionInfoLegacyIterator($cursor);
     }

src/Operation/ListDatabases.php

@@ -55,7 +55,7 @@ public function execute(Server $server)
         }
 
         $cursor = $server->executeCommand('admin', new Command($cmd));
-        $cursor->setTypeMap(array('document' => 'array'));
+        $cursor->setTypeMap(array('root' => 'array', 'document' => 'array'));
         $result = current($cursor->toArray());
 
         if (empty($result['ok'])) {

src/Operation/ListIndexes.php

@@ -76,7 +76,7 @@ private function executeCommand(Server $server)
         }
 
         $cursor = $server->executeCommand($this->databaseName, new Command($cmd));
-        $cursor->setTypeMap(array('document' => 'array'));
+        $cursor->setTypeMap(array('root' => 'array', 'document' => 'array'));
 
         return new IndexInfoIteratorIterator($cursor);
     }
@@ -97,7 +97,7 @@ private function executeLegacy(Server $server)
             : array();
 
         $cursor = $server->executeQuery($this->databaseName . '.system.indexes', new Query($filter, $options));
-        $cursor->setTypeMap(array('document' => 'array'));
+        $cursor->setTypeMap(array('root' => 'array', 'document' => 'array'));
 
         return new IndexInfoIteratorIterator($cursor);
     }

tests/Collection/CollectionFunctionalTest.php

@@ -29,9 +29,9 @@ public function testFindOne()
             'sort' => array('x' => -1),
         );
 
-        $expected = array('_id' => 3, 'x' => 33);
+        $expected = (object) array('_id' => 3, 'x' => 33);
 
-        $this->assertSame($expected, $this->collection->findOne($filter, $options));
+        $this->assertEquals($expected, $this->collection->findOne($filter, $options));
     }
 
     /**

tests/FunctionalTestCase.php

@@ -23,7 +23,7 @@ protected function assertCollectionCount($namespace, $count)
         list($databaseName, $collectionName) = explode('.', $namespace, 2);
 
         $cursor = $this->manager->executeCommand($databaseName, new Command(array('count' => $collectionName)));
-        $cursor->setTypeMap(array('document' => 'array'));
+        $cursor->setTypeMap(array('root' => 'array', 'document' => 'array'));
         $document = current($cursor->toArray());
 
         $this->assertArrayHasKey('n', $document);
@@ -76,7 +76,7 @@ protected function getServerVersion(ReadPreference $readPreference = null)
             $readPreference ?: new ReadPreference(ReadPreference::RP_PRIMARY)
         );
 
-        $cursor->setTypeMap(array('document' => 'array'));
+        $cursor->setTypeMap(array('root' => 'array', 'document' => 'array'));
         $document = current($cursor->toArray());
 
         return $document['version'];