Ensure operations return documents as objects by default

Unless the operation returns a scalar or custom value (e.g. Count, CreateIndexes), we should explicitly convert documents to stdClass instances to return. This will ultimately be made configurable once PHPLIB-112 is implemented.

A manual cast (of arrays to objects) was also necessary until PHPC-318 is implemented.

src/Operation/Aggregate.php

@@ -122,20 +122,21 @@ class Aggregate implements Executable
             return $cursor;
         }
 
+        $cursor->setTypeMap(array('document' => 'stdClass'));
         $result = current($cursor->toArray());
 
-        if (empty($result['ok'])) {
-            throw new RuntimeException(isset($result['errmsg']) ? $result['errmsg'] : 'Unknown error');
+        // TODO: Remove this once PHPC-318 is implemented
+        is_array($result) and $result = (object) $result;
+
+        if (empty($result->ok)) {
+            throw new RuntimeException(isset($result->errmsg) ? $result->errmsg : 'Unknown error');
         }
 
-        if ( ! isset($result['result']) || ! is_array($result['result'])) {
+        if ( ! isset($result->result) || ! is_array($result->result)) {
             throw new UnexpectedValueException('aggregate command did not return a "result" array');
         }
 
-        return new ArrayIterator(array_map(
-            function (stdClass $document) { return (array) $document; },
-            $result['result']
-        ));
+        return new ArrayIterator($result->result);
     }
 
     /**

src/Operation/CreateCollection.php

@@ -106,11 +106,14 @@ class CreateCollection implements Executable
     public function execute(Server $server)
     {
         $cursor = $server->executeCommand($this->databaseName, $this->createCommand());
-        $cursor->setTypeMap(array('document' => 'array'));
+        $cursor->setTypeMap(array('document' => 'stdClass'));
         $result = current($cursor->toArray());
 
-        if (empty($result['ok'])) {
-            throw new RuntimeException(isset($result['errmsg']) ? $result['errmsg'] : 'Unknown error');
+        // TODO: Remove this once PHPC-318 is implemented
+        is_array($result) and $result = (object) $result;
+
+        if (empty($result->ok)) {
+            throw new RuntimeException(isset($result->errmsg) ? $result->errmsg : 'Unknown error');
         }
 
         return $result;

src/Operation/CreateIndexes.php

@@ -91,6 +91,7 @@ class CreateIndexes implements Executable
         ));
 
         $cursor = $server->executeCommand($this->databaseName, $command);
+        $cursor->setTypeMap(array('document' => 'array'));
         $result = current($cursor->toArray());
 
         if (empty($result['ok'])) {

src/Operation/Distinct.php

@@ -62,18 +62,21 @@ class Distinct implements Executable
     public function execute(Server $server)
     {
         $cursor = $server->executeCommand($this->databaseName, $this->createCommand());
-        $cursor->setTypeMap(array('document' => 'array'));
+        $cursor->setTypeMap(array('document' => 'stdClass'));
         $result = current($cursor->toArray());
 
-        if (empty($result['ok'])) {
-            throw new RuntimeException(isset($result['errmsg']) ? $result['errmsg'] : 'Unknown error');
+        // TODO: Remove this once PHPC-318 is implemented
+        is_array($result) and $result = (object) $result;
+
+        if (empty($result->ok)) {
+            throw new RuntimeException(isset($result->errmsg) ? $result->errmsg : 'Unknown error');
         }
 
-        if ( ! isset($result['values']) || ! is_array($result['values'])) {
+        if ( ! isset($result->values) || ! is_array($result->values)) {
             throw new UnexpectedValueException('distinct command did not return a "values" array');
         }
 
-        return $result['values'];
+        return $result->values;
     }
 
     /**

src/Operation/DropCollection.php

@@ -41,11 +41,14 @@ class DropCollection implements Executable
     public function execute(Server $server)
     {
         $cursor = $server->executeCommand($this->databaseName, new Command(array('drop' => $this->collectionName)));
-        $cursor->setTypeMap(array('document' => 'array'));
+        $cursor->setTypeMap(array('document' => 'stdClass'));
         $result = current($cursor->toArray());
 
-        if (empty($result['ok'])) {
-            throw new RuntimeException(isset($result['errmsg']) ? $result['errmsg'] : 'Unknown error');
+        // TODO: Remove this once PHPC-318 is implemented
+        is_array($result) and $result = (object) $result;
+
+        if (empty($result->ok)) {
+            throw new RuntimeException(isset($result->errmsg) ? $result->errmsg : 'Unknown error');
         }
 
         return $result;

src/Operation/DropDatabase.php

@@ -39,11 +39,14 @@ class DropDatabase implements Executable
     public function execute(Server $server)
     {
         $cursor = $server->executeCommand($this->databaseName, new Command(array('dropDatabase' => 1)));
-        $cursor->setTypeMap(array('document' => 'array'));
+        $cursor->setTypeMap(array('document' => 'stdClass'));
         $result = current($cursor->toArray());
 
-        if (empty($result['ok'])) {
-            throw new RuntimeException(isset($result['errmsg']) ? $result['errmsg'] : 'Unknown error');
+        // TODO: Remove this once PHPC-318 is implemented
+        is_array($result) and $result = (object) $result;
+
+        if (empty($result->ok)) {
+            throw new RuntimeException(isset($result->errmsg) ? $result->errmsg : 'Unknown error');
         }
 
         return $result;

src/Operation/DropIndexes.php

@@ -56,10 +56,14 @@ class DropIndexes implements Executable
         );
 
         $cursor = $server->executeCommand($this->databaseName, new Command($cmd));
+        $cursor->setTypeMap(array('document' => 'stdClass'));
         $result = current($cursor->toArray());
 
-        if (empty($result['ok'])) {
-            throw new RuntimeException(isset($result['errmsg']) ? $result['errmsg'] : 'Unknown error');
+        // TODO: Remove this once PHPC-318 is implemented
+        is_array($result) and $result = (object) $result;
+
+        if (empty($result->ok)) {
+            throw new RuntimeException(isset($result->errmsg) ? $result->errmsg : 'Unknown error');
         }
 
         return $result;

src/Operation/FindAndModify.php

@@ -118,14 +118,17 @@ class FindAndModify implements Executable
     public function execute(Server $server)
     {
         $cursor = $server->executeCommand($this->databaseName, $this->createCommand());
-        $cursor->setTypeMap(array('document' => 'array'));
+        $cursor->setTypeMap(array('document' => 'stdClass'));
         $result = current($cursor->toArray());
 
-        if (empty($result['ok'])) {
-            throw new RuntimeException(isset($result['errmsg']) ? $result['errmsg'] : 'Unknown error');
+        // TODO: Remove this once PHPC-318 is implemented
+        is_array($result) and $result = (object) $result;
+
+        if (empty($result->ok)) {
+            throw new RuntimeException(isset($result->errmsg) ? $result->errmsg : 'Unknown error');
         }
 
-        if ( ! isset($result['value'])) {
+        if ( ! isset($result->value)) {
             return null;
         }
 
@@ -134,17 +137,17 @@ class FindAndModify implements Executable
          * requested.
          */
         if ($this->options['upsert'] && ! $this->options['new'] &&
-            isset($result['lastErrorObject']->updatedExisting) &&
-            ! $result['lastErrorObject']->updatedExisting) {
+            isset($result->lastErrorObject->updatedExisting) &&
+            ! $result->lastErrorObject->updatedExisting) {
 
             return null;
         }
 
-        if ( ! is_array($result['value'])) {
+        if ( ! is_object($result->value)) {
             throw new UnexpectedValueException('findAndModify command did not return a "value" document');
         }
 
-        return (object) $result['value'];
+        return $result->value;
     }
 
     /**