Support new aggregation pipeline stages in builder (#2513)

* Add $densify stage to aggregation pipeline builder * Add $fill stage to aggregation pipeline builder * Add $merge stage to aggregation pipeline builder * Add $replaceWith stage to aggregation pipeline builder * Add $set stage to aggregation pipeline builder * Add $unset stage to aggregation pipeline builder * Add $unionWith stage to aggregation pipeline builder * Use templates for Builder::addStage * Add template covariance error to psalm baseline * Remove unnecessary abstraction for $addFields and $set * Use array_fields for lists in variadic arguments * Improve wording when field name is required in Expr classes * Add missing type to whenMatched option * Update type for let option * Use ? syntax for nullable type * Rename test methods to hide copy/paste * Test all range options for $densify * Test complex values and sort for $fill * Test reusing same builder for $merge * Simplify creation of UTCDateTime instances in tests * Allow expressions as partition in $fill stage * Define psalm types for most pipeline stages * Improve handling of required options as typed arguments
doctrine · Mar 24, 2023 · 8b3f57a · 8b3f57a
1 parent daa27d7
commit 8b3f57a
Show file tree

Hide file tree

Showing 62 changed files with 2,729 additions and 595 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Aggregation.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Aggregation.php
@@ -17,6 +17,7 @@
 use function array_merge;
 use function assert;
 
+/** @psalm-import-type PipelineExpression from Builder */
 final class Aggregation implements IteratorAggregate
 {
     private DocumentManager $dm;
@@ -25,7 +26,10 @@ final class Aggregation implements IteratorAggregate
 
     private Collection $collection;
 
-    /** @var array<string, mixed> */
+    /**
+     * @var array<string, mixed>
+     * @psalm-var PipelineExpression
+     */
     private array $pipeline;
 
     /** @var array<string, mixed> */
@@ -36,6 +40,7 @@ final class Aggregation implements IteratorAggregate
     /**
      * @param array<string, mixed> $pipeline
      * @param array<string, mixed> $options
+     * @psalm-param PipelineExpression $pipeline
      */
     public function __construct(DocumentManager $dm, ?ClassMetadata $classMetadata, Collection $collection, array $pipeline, array $options = [], bool $rewindable = true)
     {