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

.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": "franmomu@gmail.com" }
     ],
     "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",
@@ -41,10 +41,10 @@
         "ext-bcmath": "*",
         "doctrine/coding-standard": "^11.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",
+        "phpunit/phpunit": "^9.6 || ^10.0.15",
         "squizlabs/php_codesniffer": "^3.5",
         "symfony/cache": "^4.4 || ^5.0 || ^6.0",
         "vimeo/psalm": "^5.9.0"
@@ -60,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"