Skip to content

[2.0] Fix wrong syntax for replaceRoot stage #2041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 16, 2019
Merged

[2.0] Fix wrong syntax for replaceRoot stage #2041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/Doctrine/ODM/MongoDB/Aggregation/Stage/ReplaceRoot.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
],
];
}

Expand Down
8 changes: 6 additions & 2 deletions tests/Doctrine/ODM/MongoDB/Tests/Aggregation/BuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))],
],
],
],
],
];
Expand Down Expand Up @@ -265,7 +269,7 @@ public function testFieldNameConversion()
[
'$sort' => ['ip' => 1],
],
['$replaceRoot' => '$ip'],
['$replaceRoot' => ['newRoot' => '$ip']],
];

$this->assertEquals($expectedPipeline, $builder->getPipeline());
Expand Down
16 changes: 12 additions & 4 deletions tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/ReplaceRootTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ public function testTypeConversion()
$this->assertEquals(
[
'$replaceRoot' => [
'isToday' => ['$eq' => ['$createdAt', $mongoDate]],
'newRoot' => (object) [
'isToday' => ['$eq' => ['$createdAt', $mongoDate]],
],
],
],
$stage->getExpression()
Expand All @@ -49,7 +51,9 @@ public function testTypeConversionWithDirectExpression()
$this->assertEquals(
[
'$replaceRoot' => [
'isToday' => ['$eq' => ['$createdAt', $mongoDate]],
'newRoot' => (object) [
'isToday' => ['$eq' => ['$createdAt', $mongoDate]],
],
],
],
$stage->getExpression()
Expand All @@ -68,7 +72,9 @@ public function testFieldNameConversion()
$this->assertEquals(
[
'$replaceRoot' => [
'someField' => ['$concat' => ['$ip', 'foo']],
'newRoot' => (object) [
'someField' => ['$concat' => ['$ip', 'foo']],
],
],
],
$stage->getExpression()
Expand All @@ -83,7 +89,9 @@ public function testFieldNameConversionWithDirectExpression()
->replaceRoot('$authorIp');

$this->assertEquals(
['$replaceRoot' => '$ip'],
[
'$replaceRoot' => ['newRoot' => '$ip'],
],
$stage->getExpression()
);
}
Expand Down