PHPLIB-74: Use Client's default type map for Database and Collection

This ensures that the library's default type map (i.e. model classes) are used for manually constructed Database and Collection objects.

Author: jmikola

src/Client.php

@@ -14,6 +14,12 @@
 
 class Client
 {
+    private static $defaultTypeMap = [
+        'array' => 'MongoDB\Model\BSONArray',
+        'document' => 'MongoDB\Model\BSONDocument',
+        'root' => 'MongoDB\Model\BSONDocument',
+    ];
+
     private $manager;
     private $uri;
     private $typeMap;
@@ -41,13 +47,7 @@ class Client
      */
     public function __construct($uri = 'mongodb://localhost:27017', array $uriOptions = [], array $driverOptions = [])
     {
-        $driverOptions += [
-            'typeMap' => [
-                'array' => 'MongoDB\Model\BSONArray',
-                'document' => 'MongoDB\Model\BSONDocument',
-                'root' => 'MongoDB\Model\BSONDocument',
-            ],
-        ];
+        $driverOptions += ['typeMap' => self::$defaultTypeMap];
 
         if (isset($driverOptions['typeMap']) && ! is_array($driverOptions['typeMap'])) {
             throw InvalidArgumentException::invalidType('"typeMap" driver option', $driverOptions['typeMap'], 'array');

src/Collection.php

@@ -36,6 +36,11 @@
 
 class Collection
 {
+    private static $defaultTypeMap = [
+        'array' => 'MongoDB\Model\BSONArray',
+        'document' => 'MongoDB\Model\BSONDocument',
+        'root' => 'MongoDB\Model\BSONDocument',
+    ];
     private static $wireVersionForFindAndModifyWriteConcern = 4;
 
     private $collectionName;
@@ -102,7 +107,7 @@ public function __construct(Manager $manager, $namespace, array $options = [])
         $this->manager = $manager;
         $this->readConcern = isset($options['readConcern']) ? $options['readConcern'] : $this->manager->getReadConcern();
         $this->readPreference = isset($options['readPreference']) ? $options['readPreference'] : $this->manager->getReadPreference();
-        $this->typeMap = isset($options['typeMap']) ? $options['typeMap'] : null;
+        $this->typeMap = isset($options['typeMap']) ? $options['typeMap'] : self::$defaultTypeMap;
         $this->writeConcern = isset($options['writeConcern']) ? $options['writeConcern'] : $this->manager->getWriteConcern();
     }
 

src/Database.php

@@ -20,6 +20,12 @@
 
 class Database
 {
+    private static $defaultTypeMap = [
+        'array' => 'MongoDB\Model\BSONArray',
+        'document' => 'MongoDB\Model\BSONDocument',
+        'root' => 'MongoDB\Model\BSONDocument',
+    ];
+
     private $databaseName;
     private $manager;
     private $readConcern;
@@ -80,7 +86,7 @@ public function __construct(Manager $manager, $databaseName, array $options = []
         $this->databaseName = (string) $databaseName;
         $this->readConcern = isset($options['readConcern']) ? $options['readConcern'] : $this->manager->getReadConcern();
         $this->readPreference = isset($options['readPreference']) ? $options['readPreference'] : $this->manager->getReadPreference();
-        $this->typeMap = isset($options['typeMap']) ? $options['typeMap'] : null;
+        $this->typeMap = isset($options['typeMap']) ? $options['typeMap'] : self::$defaultTypeMap;
         $this->writeConcern = isset($options['writeConcern']) ? $options['writeConcern'] : $this->manager->getWriteConcern();
     }
 

tests/Collection/CollectionFunctionalTest.php

@@ -115,9 +115,9 @@ public function testFindOne()
             'sort' => ['x' => -1],
         ];
 
-        $expected = (object) ['_id' => 3, 'x' => 33];
+        $expected = ['_id' => 3, 'x' => 33];
 
-        $this->assertEquals($expected, $this->collection->findOne($filter, $options));
+        $this->assertSameDocument($expected, $this->collection->findOne($filter, $options));
     }
 
     public function testWithOptionsInheritsReadPreferenceAndWriteConcern()

tests/FunctionalTestCase.php

@@ -32,9 +32,7 @@ protected function assertCollectionCount($namespace, $count)
 
     protected function assertCommandSucceeded($document)
     {
-        if (is_object($document)) {
-            $document = get_object_vars($document);
-        }
+        $document = is_object($document) ? (array) $document : $document;
 
         $this->assertArrayHasKey('ok', $document);
         $this->assertEquals(1, $document['ok']);
@@ -43,8 +41,8 @@ protected function assertCommandSucceeded($document)
     protected function assertSameDocument($expectedDocument, $actualDocument)
     {
         $this->assertEquals(
-            ($expectedDocument instanceof stdClass) ? (array) $expectedDocument : $expectedDocument,
-            ($actualDocument instanceof stdClass) ? (array) $actualDocument : $actualDocument
+            is_object($expectedDocument) ? (array) $expectedDocument : $expectedDocument,
+            is_object($actualDocument) ? (array) $actualDocument : $actualDocument
         );
     }
 
@@ -59,7 +57,7 @@ protected function assertSameDocuments(array $expectedDocuments, $actualDocument
         }
 
         $normalizeRootDocuments = function($document) {
-            return ($document instanceof stdClass) ? (array) $document : $document;
+            return is_object($document) ? (array) $document : $document;
         };
 
         $this->assertEquals(