Merge pull request #256 from alcaeus/aggregation-group-allow-operators

Allow using operators in group stages
doctrine · Mar 18, 2016 · ab3e697 · ab3e697
2 parents 2ffb37a + 2eb3c8e
commit ab3e697
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/lib/Doctrine/MongoDB/Aggregation/Stage/Group.php b/lib/Doctrine/MongoDB/Aggregation/Stage/Group.php
@@ -29,23 +29,8 @@
  * @author alcaeus <[email protected]>
  * @since 1.2
  */
-class Group extends Stage
+class Group extends Operator
 {
-    /**
-     * @var Expr
-     */
-    protected $expr;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct(Builder $builder)
-    {
-        $this->expr = new Expr();
-
-        parent::__construct($builder);
-    }
-
     /**
      * {@inheritdoc}
      */

diff --git a/tests/Doctrine/MongoDB/Tests/Aggregation/Stage/GroupTest.php b/tests/Doctrine/MongoDB/Tests/Aggregation/Stage/GroupTest.php
@@ -74,4 +74,16 @@ public function testGroupFromBuilder()
 
         $this->assertSame(array(array('$group' => array('_id' => '$field', 'count' => array('$sum' => 1)))), $builder->getPipeline());
     }
+
+    public function testGroupWithOperatorInId()
+    {
+        $groupStage = new Group($this->getTestAggregationBuilder());
+        $groupStage
+            ->field('_id')
+            ->year('$dateField')
+            ->field('count')
+            ->sum(1);
+
+        $this->assertSame(array('$group' => array('_id' => ['$year' => '$dateField'], 'count' => array('$sum' => 1))), $groupStage->getExpression());
+    }
 }