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

doctrine · Nov 3, 2023 · 990a35c · 990a35c
2 parents fa10f36 + b7c7838
commit 990a35c
Show file tree

Hide file tree

Showing 343 changed files with 14,935 additions and 8,331 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -17,8 +17,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
-          - "8.0"
           - "8.1"
           - "8.2"
           - "8.3"
@@ -32,17 +30,27 @@ jobs:
           - "server"
         dependencies:
           - "highest"
+        symfony-version:
+          - "stable"
         include:
           - dependencies: "lowest"
-            php-version: "7.4"
+            php-version: "8.1"
             mongodb-version: "4.4"
             driver-version: "1.11.0"
             topology: "server"
+            symfony-version: "stable"
           - topology: "sharded_cluster"
             php-version: "8.2"
             mongodb-version: "4.4"
             driver-version: "stable"
             dependencies: "highest"
+            symfony-version: "stable"
+          - topology: "server"
+            php-version: "8.2"
+            mongodb-version: "6.0"
+            driver-version: "stable"
+            dependencies: "highest"
+            symfony-version: "7"
 
     steps:
       - name: "Checkout"
@@ -81,6 +89,17 @@ jobs:
       - name: "Remove phpbench/phpbench"
         run: composer remove --no-update --dev phpbench/phpbench
 
+      - name: "Configure Symfony v7@dev"
+        if: "${{ matrix.symfony-version == '7' }}"
+        run: |
+          composer config minimum-stability dev
+          # not yet ready for v7
+          composer remove --no-update --dev vimeo/psalm
+          # update symfony deps
+          composer require --no-update symfony/console:^7@dev
+          composer require --no-update symfony/var-dumper:^7@dev
+          composer require --no-update --dev symfony/cache:^7@dev
+
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v2"
         with:

diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
+          - "8.1"
 
     services:
       mongodb:

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -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)"
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ vendor/
 .phpunit.cache
 .phpunit.result.cache
 phpcs.xml
+psalm.xml
diff --git a/UPGRADE-2.6.md b/UPGRADE-2.6.md
@@ -0,0 +1,15 @@
+# UPGRADE FROM to 2.6
+
+## PHP requirements
+
+* MongoDB ODM 2.6 requires PHP 8.1 or newer. If you're not running PHP 8.1 yet,
+  it's recommended that you upgrade to PHP 8.1 before upgrading ODM.
+
+## `Match` classes were removed
+
+Minimal requirement of PHP 8.1 has rendered `Match` classes useless as one may
+not use them for backward compatibility purposes as `match` is a reserved keyword.
+
+Following classes were removed:
+- `\Doctrine\ODM\MongoDB\Aggregation\Stage\GraphLookup\Match`
+- `\Doctrine\ODM\MongoDB\Aggregation\Stage\Match`
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         { "name": "Fran Moreno", "email": "franmomu@gmail.com" }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.1",
         "ext-mongodb": "^1.11",
         "doctrine/annotations": "^1.12 || ^2.0",
         "doctrine/cache": "^1.11 || ^2.0",
@@ -33,19 +33,20 @@
         "jean85/pretty-package-versions": "^1.3.0 || ^2.0.1",
         "mongodb/mongodb": "^1.10.0",
         "psr/cache": "^1.0 || ^2.0 || ^3.0",
-        "symfony/console": "^3.4 || ^4.1 || ^5.0 || ^6.0",
+        "symfony/console": "^5.4 || ^6.0 || ^7.0",
         "symfony/deprecation-contracts": "^2.2 || ^3.0",
-        "symfony/var-dumper": "^3.4 || ^4.1 || ^5.0 || ^6.0"
+        "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0"
     },
     "require-dev": {
         "ext-bcmath": "*",
         "doctrine/coding-standard": "^12.0",
         "jmikola/geojson": "^1.0",
-        "phpbench/phpbench": "^1.0.0@dev",
+        "phpbench/phpbench": "^1.0.0",
         "phpstan/phpstan": "^1.10.11",
         "phpstan/phpstan-phpunit": "^1.0",
-        "phpunit/phpunit": "^9.5.5 || ^10.0.15",
-        "symfony/cache": "^4.4 || ^5.0 || ^6.0",
+        "phpunit/phpunit": "^10.4",
+        "squizlabs/php_codesniffer": "^3.5",
+        "symfony/cache": "^5.4 || ^6.0 || ^7.0",
         "vimeo/psalm": "^5.9.0"
     },
     "suggest": {
@@ -59,7 +60,6 @@
             "Doctrine\\ODM\\MongoDB\\Benchmark\\": "benchmark",
             "Doctrine\\ODM\\MongoDB\\Tests\\": "tests/Doctrine/ODM/MongoDB/Tests",
             "Documents\\": "tests/Documents",
-            "Documents74\\": "tests/Documents74",
             "Documents81\\": "tests/Documents81",
             "Stubs\\": "tests/Stubs",
             "TestDocuments\\" :"tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/fixtures"