Fix wrong syntax for replaceRoot stage

doctrine · Jul 11, 2019 · b678b7d · b678b7d
1 parent a50624c
commit b678b7d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/ReplaceRoot.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/ReplaceRoot.php
@@ -40,8 +40,12 @@ public function __construct(Builder $builder, DocumentManager $documentManager,
      */
     public function getExpression() : array
     {
+        $expression = $this->expression !== null ? $this->convertExpression($this->expression) : $this->expr->getExpression();
+
         return [
-            '$replaceRoot' => $this->expression !== null ? $this->convertExpression($this->expression) : $this->expr->getExpression(),
+            '$replaceRoot' => [
+                'newRoot' => is_array($expression) ? (object) $expression : $expression,
+            ],
         ];
     }
 

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/BuilderTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/BuilderTest.php
@@ -233,7 +233,11 @@ public function testPipelineConvertsTypes()
             ],
             [
                 '$replaceRoot' => [
-                    'isToday' => ['$eq' => ['$createdAt', new UTCDateTime((int) $dateTime->format('Uv'))]],
+                    'newRoot' => (object) [
+                        'isToday' => [
+                            '$eq' => ['$createdAt', new UTCDateTime((int) $dateTime->format('Uv'))],
+                        ],
+                    ],
                 ],
             ],
         ];
@@ -265,7 +269,7 @@ public function testFieldNameConversion()
             [
                 '$sort' => ['ip' => 1],
             ],
-            ['$replaceRoot' => '$ip'],
+            ['$replaceRoot' => ['newRoot' => '$ip']],
         ];
 
         $this->assertEquals($expectedPipeline, $builder->getPipeline());

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/ReplaceRootTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/ReplaceRootTest.php
@@ -26,7 +26,9 @@ public function testTypeConversion()
         $this->assertEquals(
             [
                 '$replaceRoot' => [
-                    'isToday' => ['$eq' => ['$createdAt', $mongoDate]],
+                    'newRoot' => (object) [
+                        'isToday' => ['$eq' => ['$createdAt', $mongoDate]],
+                    ],
                 ],
             ],
             $stage->getExpression()
@@ -49,7 +51,9 @@ public function testTypeConversionWithDirectExpression()
         $this->assertEquals(
             [
                 '$replaceRoot' => [
-                    'isToday' => ['$eq' => ['$createdAt', $mongoDate]],
+                    'newRoot' => (object) [
+                        'isToday' => ['$eq' => ['$createdAt', $mongoDate]],
+                    ],
                 ],
             ],
             $stage->getExpression()
@@ -68,7 +72,9 @@ public function testFieldNameConversion()
         $this->assertEquals(
             [
                 '$replaceRoot' => [
-                    'someField' => ['$concat' => ['$ip', 'foo']],
+                    'newRoot' => (object) [
+                        'someField' => ['$concat' => ['$ip', 'foo']],
+                    ],
                 ],
             ],
             $stage->getExpression()
@@ -83,7 +89,9 @@ public function testFieldNameConversionWithDirectExpression()
             ->replaceRoot('$authorIp');
 
         $this->assertEquals(
-            ['$replaceRoot' => '$ip'],
+            [
+                '$replaceRoot' => ['newRoot' => '$ip']
+            ],
             $stage->getExpression()
         );
     }