Fixed PHPLIB-108: Library relies on BSON being a vendor prefix, while our vendor should be MongoDB

Author: derickr

src/BulkWriteResult.php

@@ -2,7 +2,7 @@
 
 namespace MongoDB;
 
-use BSON\ObjectId;
+use MongoDB\BSON\ObjectId;
 use MongoDB\Driver\WriteResult;
 
 /**

src/Collection.php

@@ -868,6 +868,17 @@ final protected function _opQueryFlags($options)
         return $flags;
     }
 
+    /**
+     * Internal helper for running a command
+     * @internal
+     */
+    final protected function _runCommand($dbname, array $cmd, ReadPreference $rp = null)
+    {
+        //var_dump(\MongoDB\BSON\toJSON(\MongoDB\BSON\fromArray($cmd)));
+        $command = new Command($cmd);
+        return $this->manager->executeCommand($dbname, $command, $rp);
+    }
+
     /**
      * Internal helper for replacing/updating one/many documents
      * @internal

src/Model/IndexInput.php

@@ -2,7 +2,7 @@
 
 namespace MongoDB\Model;
 
-use BSON\Serializable;
+use MongoDB\BSON\Serializable;
 use MongoDB\Exception\InvalidArgumentException;
 use MongoDB\Exception\UnexpectedTypeException;
 

tests/Collection/BulkWriteFunctionalTest.php

@@ -28,7 +28,7 @@ public function testInserts()
 
         $insertedIds = $result->getInsertedIds();
         $this->assertSame(1, $insertedIds[0]);
-        $this->assertInstanceOf('BSON\ObjectId', $insertedIds[1]);
+        $this->assertInstanceOf('MongoDB\BSON\ObjectId', $insertedIds[1]);
 
         $expected = array(
             array('_id' => $insertedIds[0], 'x' => 11),
@@ -58,7 +58,7 @@ public function testUpdates()
 
         $upsertedIds = $result->getUpsertedIds();
         $this->assertSame(5, $upsertedIds[2]);
-        $this->assertInstanceOf('BSON\ObjectId', $upsertedIds[3]);
+        $this->assertInstanceOf('MongoDB\BSON\ObjectId', $upsertedIds[3]);
 
         $expected = array(
             array('_id' => 1, 'x' => 11),
@@ -215,4 +215,4 @@ private function createFixtures($n)
 
         $this->assertEquals($n, $result->getInsertedCount());
     }
-}
+}

tests/Model/IndexInputTest.php

@@ -87,7 +87,7 @@ public function testBsonSerialization()
             'ns' => 'foo.bar',
         ));
 
-        $this->assertInstanceOf('BSON\Serializable', $indexInput);
+        $this->assertInstanceOf('MongoDB\BSON\Serializable', $indexInput);
         $this->assertEquals($expected, $indexInput->bsonSerialize());
     }
 }