Return documents as objects from Collection findAndModify methods

src/Collection.php

@@ -460,7 +460,7 @@ class Collection
      * @see FindOneAndDelete::__construct() for supported options
      * @param array|object $filter  Query by which to filter documents
      * @param array        $options Command options
-     * @return array|null
+     * @return object|null
      */
     public function findOneAndDelete($filter, array $options = array())
     {
@@ -482,7 +482,7 @@ class Collection
      * @param array|object $filter      Query by which to filter documents
      * @param array|object $replacement Replacement document
      * @param array        $options     Command options
-     * @return array|null
+     * @return object|null
      */
     public function findOneAndReplace($filter, $replacement, array $options = array())
     {
@@ -504,7 +504,7 @@ class Collection
      * @param array|object $filter  Query by which to filter documents
      * @param array|object $update  Update to apply to the matched document
      * @param array        $options Command options
-     * @return array|null
+     * @return object|null
      */
     public function findOneAndUpdate($filter, $update, array $options = array())
     {

src/Operation/FindAndModify.php

@@ -113,7 +113,7 @@ class FindAndModify implements Executable
      *
      * @see Executable::execute()
      * @param Server $server
-     * @return array|null
+     * @return object|null
      */
     public function execute(Server $server)
     {
@@ -143,7 +143,7 @@ class FindAndModify implements Executable
             throw new UnexpectedValueException('findAndModify command did not return a "value" document');
         }
 
-        return (array) $result['value'];
+        return $result['value'];
     }
 
     /**

src/Operation/FindOneAndDelete.php

@@ -74,7 +74,7 @@ class FindOneAndDelete implements Executable
      *
      * @see Executable::execute()
      * @param Server $server
-     * @return array|null
+     * @return object|null
      */
     public function execute(Server $server)
     {

src/Operation/FindOneAndReplace.php

@@ -113,7 +113,7 @@ class FindOneAndReplace implements Executable
      *
      * @see Executable::execute()
      * @param Server $server
-     * @return array|null
+     * @return object|null
      */
     public function execute(Server $server)
     {

src/Operation/FindOneAndUpdate.php

@@ -113,7 +113,7 @@ class FindOneAndUpdate implements Executable
      *
      * @see Executable::execute()
      * @param Server $server
-     * @return array|null
+     * @return object|null
      */
     public function execute(Server $server)
     {

tests/Collection/CrudSpec/FindOneAndDeleteFunctionalTest.php

@@ -25,7 +25,7 @@ class FindOneAndDeleteFunctionalTest extends FunctionalTestCase
         );
 
         $document = $this->collection->findOneAndDelete($filter, $options);
-        $this->assertSame(array('x' => 22), $document);
+        $this->assertEquals((object) array('x' => 22), $document);
 
         $expected = array(
             array('_id' => 1, 'x' => 11),
@@ -44,7 +44,7 @@ class FindOneAndDeleteFunctionalTest extends FunctionalTestCase
         );
 
         $document = $this->collection->findOneAndDelete($filter, $options);
-        $this->assertSame(array('x' => 22), $document);
+        $this->assertEquals((object) array('x' => 22), $document);
 
         $expected = array(
             array('_id' => 1, 'x' => 11),

tests/Collection/CrudSpec/FindOneAndReplaceFunctionalTest.php

@@ -29,7 +29,7 @@ class FindOneAndReplaceFunctionalTest extends FunctionalTestCase
         );
 
         $document = $this->collection->findOneAndReplace($filter, $replacement, $options);
-        $this->assertSame(array('x' => 22), $document);
+        $this->assertEquals((object) array('x' => 22), $document);
 
         $expected = array(
             array('_id' => 1, 'x' => 11),
@@ -51,7 +51,7 @@ class FindOneAndReplaceFunctionalTest extends FunctionalTestCase
         );
 
         $document = $this->collection->findOneAndReplace($filter, $replacement, $options);
-        $this->assertSame(array('x' => 32), $document);
+        $this->assertEquals((object) array('x' => 32), $document);
 
         $expected = array(
             array('_id' => 1, 'x' => 11),
@@ -72,7 +72,7 @@ class FindOneAndReplaceFunctionalTest extends FunctionalTestCase
         );
 
         $document = $this->collection->findOneAndReplace($filter, $replacement, $options);
-        $this->assertSame(array('x' => 22), $document);
+        $this->assertEquals((object) array('x' => 22), $document);
 
         $expected = array(
             array('_id' => 1, 'x' => 11),
@@ -94,7 +94,7 @@ class FindOneAndReplaceFunctionalTest extends FunctionalTestCase
         );
 
         $document = $this->collection->findOneAndReplace($filter, $replacement, $options);
-        $this->assertSame(array('x' => 32), $document);
+        $this->assertEquals((object) array('x' => 32), $document);
 
         $expected = array(
             array('_id' => 1, 'x' => 11),
@@ -185,7 +185,7 @@ class FindOneAndReplaceFunctionalTest extends FunctionalTestCase
         );
 
         $document = $this->collection->findOneAndReplace($filter, $replacement, $options);
-        $this->assertSame(array('x' => 44), $document);
+        $this->assertEquals((object) array('x' => 44), $document);
 
         $expected = array(
             array('_id' => 1, 'x' => 11),

tests/Collection/CrudSpec/FindOneAndUpdateFunctionalTest.php

@@ -29,7 +29,7 @@ class FindOneAndUpdateFunctionalTest extends FunctionalTestCase
         );
 
         $document = $this->collection->findOneAndUpdate($filter, $update, $options);
-        $this->assertSame(array('x' => 22), $document);
+        $this->assertEquals((object) array('x' => 22), $document);
 
         $expected = array(
             array('_id' => 1, 'x' => 11),
@@ -51,7 +51,7 @@ class FindOneAndUpdateFunctionalTest extends FunctionalTestCase
         );
 
         $document = $this->collection->findOneAndUpdate($filter, $update, $options);
-        $this->assertSame(array('x' => 23), $document);
+        $this->assertEquals((object) array('x' => 23), $document);
 
         $expected = array(
             array('_id' => 1, 'x' => 11),
@@ -72,7 +72,7 @@ class FindOneAndUpdateFunctionalTest extends FunctionalTestCase
         );
 
         $document = $this->collection->findOneAndUpdate($filter, $update, $options);
-        $this->assertSame(array('x' => 22), $document);
+        $this->assertEquals((object) array('x' => 22), $document);
 
         $expected = array(
             array('_id' => 1, 'x' => 11),
@@ -94,7 +94,7 @@ class FindOneAndUpdateFunctionalTest extends FunctionalTestCase
         );
 
         $document = $this->collection->findOneAndUpdate($filter, $update, $options);
-        $this->assertSame(array('x' => 23), $document);
+        $this->assertEquals((object) array('x' => 23), $document);
 
         $expected = array(
             array('_id' => 1, 'x' => 11),
@@ -183,7 +183,7 @@ class FindOneAndUpdateFunctionalTest extends FunctionalTestCase
         );
 
         $document = $this->collection->findOneAndUpdate($filter, $update, $options);
-        $this->assertSame(array('x' => 1), $document);
+        $this->assertEquals((object) array('x' => 1), $document);
 
         $expected = array(
             array('_id' => 1, 'x' => 11),