Merge release 2.12.0 into 3.0.x

.doctrine-project.json

@@ -5,142 +5,113 @@
     "slug": "mongodb-odm",
     "docsSlug": "doctrine-mongodb-odm",
     "versions": [
+        {
+            "name": "2.13",
+            "branchName": "2.13.x",
+            "slug": "latest",
+            "upcoming": true
+        },
+        {
+            "name": "2.12",
+            "branchName": "2.12.x",
+            "slug": "latest",
+            "current": true
+        },
+        {
+            "name": "2.11",
+            "branchName": "2.11.x",
+            "slug": "2.11",
+            "maintained": false
+        },
         {
             "name": "2.10",
             "branchName": "2.10.x",
-            "slug": "latest",
-            "upcoming": true,
-            "aliases": [
-                "2.10.x"
-            ]
+            "slug": "2.10",
+            "maintained": false
         },
         {
             "name": "2.9",
             "branchName": "2.9.x",
             "slug": "2.9",
-            "current": true,
-            "aliases": [
-                "current",
-                "stable",
-                "2.9.x"
-            ]
+            "maintained": false
         },
         {
             "name": "2.8",
             "branchName": "2.8.x",
             "slug": "2.8",
-            "maintained": false,
-            "aliases": [
-                "2.8.x"
-            ]
+            "maintained": false
         },
         {
             "name": "2.7",
             "branchName": "2.7.x",
             "slug": "2.7",
-            "maintained": false,
-            "aliases": [
-                "2.7.x"
-            ]
+            "maintained": false
         },
         {
             "name": "2.6",
             "branchName": "2.6.x",
             "slug": "2.6",
-            "maintained": false,
-            "aliases": [
-                "2.6.x"
-            ]
+            "maintained": false
         },
         {
             "name": "2.5",
             "branchName": "2.5.x",
             "slug": "2.5",
-            "maintained": false,
-            "aliases": [
-                "2.5.x"
-            ]
+            "maintained": false
         },
         {
             "name": "2.4",
             "branchName": "2.4.x",
             "slug": "2.4",
-            "maintained": false,
-            "aliases": [
-                "2.4.x"
-            ]
+            "maintained": false
         },
         {
             "name": "2.3",
             "branchName": "2.3.x",
             "slug": "2.3",
-            "maintained": false,
-            "aliases": [
-                "2.3.x"
-            ]
+            "maintained": false
         },
         {
             "name": "2.2",
             "branchName": "2.2.x",
             "slug": "2.2",
-            "maintained": false,
-            "aliases": [
-                "2.2.x"
-            ]
+            "maintained": false
         },
         {
             "name": "2.1",
             "branchName": "2.1.x",
             "slug": "2.1",
-            "maintained": false,
-            "aliases": [
-                "2.1.x"
-            ]
+            "maintained": false
         },
         {
             "name": "2.0",
             "branchName": "2.0.x",
             "slug": "2.0",
-            "maintained": false,
-            "aliases": [
-                "2.0.x"
-            ]
+            "maintained": false
         },
         {
             "name": "1.3",
             "branchName": "1.3.x",
             "slug": "1.3",
-            "maintained": false,
-            "aliases": [
-                "1.3.x"
-            ]
+            "maintained": false
         },
         {
             "name": "1.2",
             "branchName": "1.2.x",
             "slug": "1.2",
-            "maintained": false,
-            "aliases": [
-                "1.2.x"
-            ]
+            "maintained": false
         },
         {
             "name": "1.1",
             "branchName": "1.1.x",
             "slug": "1.1",
-            "maintained": false,
-            "aliases": [
-                "1.1.x"
-            ]
+            "maintained": false
         },
         {
             "name": "1.0",
             "branchName": "1.0.x",
             "slug": "1.0",
-            "maintained": false,
-            "aliases": [
-                "1.0.x"
-            ]
+            "maintained": false
         }
     ]
 }

.github/workflows/coding-standards.yml

@@ -11,4 +11,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.2.2"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.3.0"

.github/workflows/continuous-integration.yml

@@ -62,6 +62,14 @@ jobs:
             dependencies: "highest"
             symfony-version: "stable"
             proxy: "lazy-ghost"
+          # Test with a 8.0 replica set
+          - topology: "replica_set"
+            php-version: "8.2"
+            mongodb-version: "8.0"
+            driver-version: "stable"
+            dependencies: "highest"
+            symfony-version: "stable"
+            proxy: "lazy-ghost"
           # Test with ProxyManager
           - php-version: "8.2"
             mongodb-version: "6.0"
@@ -89,7 +97,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v4"
+        uses: "actions/checkout@v5"
         with:
           fetch-depth: 2
 
@@ -155,3 +163,4 @@ jobs:
         env:
           DOCTRINE_MONGODB_SERVER: ${{ steps.setup-mongodb.outputs.cluster-uri }}
           USE_LAZY_GHOST_OBJECTS: ${{ matrix.proxy == 'lazy-ghost' && '1' || '0' }}"
+          CRYPT_SHARED_LIB_PATH: ${{ steps.setup-mongodb.outputs.crypt-shared-lib-path }}

.github/workflows/documentation.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: "actions/checkout@v4"
+        uses: "actions/checkout@v5"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"

.github/workflows/performance.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v4"
+        uses: "actions/checkout@v5"
 
       - name: Setup cache environment
         id: extcache

.github/workflows/release-on-milestone-closed.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.2.2"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.3.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

@@ -16,11 +16,11 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2"
+          - "8.4"
 
     steps:
       - name: "Checkout code"
-        uses: "actions/checkout@v4"
+        uses: "actions/checkout@v5"
 
       - name: Setup cache environment
         id: extcache

.github/workflows/website-schema.yml

@@ -18,4 +18,4 @@ on:
 jobs:
   json-validate:
     name: "Validate JSON schema"
-    uses: "doctrine/.github/.github/workflows/website-schema.yml@7.2.2"
+    uses: "doctrine/.github/.github/workflows/website-schema.yml@7.3.0"

composer.json

@@ -30,7 +30,7 @@
         "doctrine/instantiator": "^1.1 || ^2",
         "doctrine/persistence": "^3.2 || ^4",
         "friendsofphp/proxy-manager-lts": "^1.0",
-        "mongodb/mongodb": "^1.21 || ^2.0@dev",
+        "mongodb/mongodb": "^1.21.2 || ^2.1.1",
         "psr/cache": "^1.0 || ^2.0 || ^3.0",
         "symfony/console": "^5.4 || ^6.0 || ^7.0",
         "symfony/deprecation-contracts": "^2.2 || ^3.0",
@@ -44,8 +44,9 @@
         "doctrine/orm": "^3.2",
         "jmikola/geojson": "^1.0",
         "phpbench/phpbench": "^1.0.0",
-        "phpstan/phpstan": "~1.10.67",
-        "phpstan/phpstan-phpunit": "^1.0",
+        "phpstan/phpstan": "^2.1",
+        "phpstan/phpstan-deprecation-rules": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0",
         "phpunit/phpunit": "^10.4",
         "squizlabs/php_codesniffer": "^3.5",
         "symfony/cache": "^5.4 || ^6.0 || ^7.0"

docs/en/cookbook/lookup-reference.rst

@@ -68,7 +68,7 @@ and a date.
         #[Field(type: 'date_immutable')]
         public DateTimeImmutable $date;
 
-        /** @var Collection<Item> */
+        /** @var Collection<int, Item> */
         #[ReferenceMany(
             targetDocument: Item::class,
             cascade: 'all',
@@ -378,7 +378,7 @@ You need to create a new class to hold the result of the aggregation.
         #[Field(type: 'date_immutable')]
         public DateTimeImmutable $date;
 
-        /** @var Collection<Item> */
+        /** @var Collection<int, Item> */
         #[EmbedMany(targetDocument: Item::class)]
         public Collection $items;
 
@@ -631,7 +631,7 @@ but not the user.
         #[Field(type: 'string')]
         public string $name;
 
-        /** @var Collection<UserOrderResult> */
+        /** @var Collection<int, UserOrderResult> */
         #[EmbedMany(targetDocument: UserOrderResult::class)]
         public Collection $orders;
     }
@@ -645,7 +645,7 @@ but not the user.
         #[Field(type: 'date_immutable')]
         public DateTimeImmutable $date;
 
-        /** @var Collection<Item> */
+        /** @var Collection<int, Item> */
         #[EmbedMany(targetDocument: Item::class)]
         public Collection $items;
     }