PHPORM-239 Apply result transformation to raw() queries

Author: GromNaN

src/Eloquent/Builder.php

@@ -5,7 +5,7 @@
 namespace MongoDB\Laravel\Eloquent;
 
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
-use MongoDB\Driver\Cursor;
+use MongoDB\Driver\CursorInterface;
 use MongoDB\Driver\Exception\WriteException;
 use MongoDB\Laravel\Connection;
 use MongoDB\Laravel\Helpers\QueriesRelationships;
@@ -177,7 +177,7 @@ public function raw($value = null)
         $results = $this->query->raw($value);
 
         // Convert MongoCursor results to a collection of models.
-        if ($results instanceof Cursor) {
+        if ($results instanceof CursorInterface) {
             $results = iterator_to_array($results, false);
 
             return $this->model->hydrate($results);

src/Query/Builder.php

@@ -25,6 +25,7 @@
 use MongoDB\BSON\UTCDateTime;
 use MongoDB\Builder\Stage\FluentFactoryTrait;
 use MongoDB\Driver\Cursor;
+use MongoDB\Driver\CursorInterface;
 use Override;
 use RuntimeException;
 use stdClass;
@@ -934,7 +935,17 @@ public function raw($value = null)
     {
         // Execute the closure on the mongodb collection
         if ($value instanceof Closure) {
-            return call_user_func($value, $this->collection);
+            $results = call_user_func($value, $this->collection);
+
+            if ($results instanceof CursorInterface) {
+                $results = $results->toArray();
+            }
+
+            if (is_array($results) || is_object($results)) {
+                $results = $this->aliasIdForResult($results);
+            }
+
+            return $results;
         }
 
         // Create an expression for the given value

tests/QueryBuilderTest.php

@@ -18,7 +18,6 @@
 use MongoDB\BSON\Regex;
 use MongoDB\BSON\UTCDateTime;
 use MongoDB\Collection;
-use MongoDB\Driver\Cursor;
 use MongoDB\Driver\Monitoring\CommandFailedEvent;
 use MongoDB\Driver\Monitoring\CommandStartedEvent;
 use MongoDB\Driver\Monitoring\CommandSubscriber;
@@ -314,12 +313,16 @@ public function testRaw()
             ['name' => 'John Doe', 'age' => 25],
         ]);
 
-        $cursor = DB::table('users')->raw(function ($collection) {
-            return $collection->find(['age' => 20]);
+        $results = DB::table('users')->raw(function ($collection) {
+            return $collection->find(['age' => 20], ['typeMap' => ['root' => 'array', 'document' => 'array']]);
         });
 
-        $this->assertInstanceOf(Cursor::class, $cursor);
-        $this->assertCount(1, $cursor->toArray());
+        $this->assertIsArray($results);
+        $this->assertCount(1, $results);
+        $this->assertArrayNotHasKey('_id', $results[0]);
+        $this->assertArrayHasKey('id', $results[0]);
+        $this->assertInstanceOf(ObjectId::class, $results[0]['id']);
+        $this->assertSame(20, $results[0]['age']);
 
         $collection = DB::table('users')->raw();
         $this->assertInstanceOf(Collection::class, $collection);