Merge branch '2.6.x' into 2.5.x-merge-up-into-2.6.x_TYQBMVqZ

* 2.6.x:
  Add $search stage to aggregation pipeline builder (doctrine#2516)
  Support new aggregation operators in builder (doctrine#2514)
  Drop support for PHP 7.4 (doctrine#2515)
  Support new aggregation pipeline stages in builder (doctrine#2513)

.github/workflows/continuous-integration.yml

@@ -17,7 +17,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
           - "8.0"
           - "8.1"
           - "8.2"
@@ -33,7 +32,7 @@ jobs:
           - "highest"
         include:
           - dependencies: "lowest"
-            php-version: "7.4"
+            php-version: "8.0"
             mongodb-version: "4.4"
             driver-version: "1.11.0"
             topology: "server"

.github/workflows/performance.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
+          - "8.0"
 
     services:
       mongodb:

.github/workflows/static-analysis.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.2"
 
     steps:
       - name: "Checkout code"
@@ -88,4 +88,4 @@ jobs:
           path: composer.lock
 
       - name: "Run a static analysis with vimeo/psalm"
-        run: "vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc) --php-version=${{ matrix.php-version }}"
+        run: "vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc)"

.gitignore

@@ -11,3 +11,4 @@ vendor/
 .phpunit.cache
 .phpunit.result.cache
 phpcs.xml
+psalm.xml

UPGRADE-2.6.md

@@ -0,0 +1,6 @@
+# UPGRADE FROM to 2.6
+
+## PHP requirements
+
+* MongoDB ODM 2.6 requires PHP 8.0 or newer. If you're not running PHP 8.0 yet,
+  it's recommended that you upgrade to PHP 8.0 before upgrading ODM.

composer.json

@@ -21,7 +21,7 @@
         { "name": "Fran Moreno", "email": "[email protected]" }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "ext-mongodb": "^1.11",
         "doctrine/annotations": "^1.12 || ^2.0",
         "doctrine/cache": "^1.11 || ^2.0",

lib/Doctrine/ODM/MongoDB/Aggregation/Aggregation.php

@@ -17,34 +17,16 @@
 use function array_merge;
 use function assert;
 
+/** @psalm-import-type PipelineExpression from Builder */
 final class Aggregation implements IteratorAggregate
 {
-    private DocumentManager $dm;
-
-    private ?ClassMetadata $classMetadata;
-
-    private Collection $collection;
-
-    /** @var array<string, mixed> */
-    private array $pipeline;
-
-    /** @var array<string, mixed> */
-    private array $options;
-
-    private bool $rewindable;
-
     /**
      * @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)
+    public function __construct(private DocumentManager $dm, private ?ClassMetadata $classMetadata, private Collection $collection, private array $pipeline, private array $options = [], private bool $rewindable = true)
     {
-        $this->dm            = $dm;
-        $this->classMetadata = $classMetadata;
-        $this->collection    = $collection;
-        $this->pipeline      = $pipeline;
-        $this->options       = $options;
-        $this->rewindable    = $rewindable;
     }
 
     public function getIterator(): Iterator