Merge release 2.13.0 into 3.0.x

.doctrine-project.json

@@ -6,86 +6,79 @@
     "docsSlug": "doctrine-mongodb-odm",
     "versions": [
         {
-            "name": "2.13",
-            "branchName": "2.13.x",
+            "name": "2.14",
+            "branchName": "2.14.x",
             "slug": "latest",
             "upcoming": true
         },
         {
-            "name": "2.12",
-            "branchName": "2.12.x",
-            "slug": "latest",
+            "name": "2.13",
+            "branchName": "2.13.x",
+            "slug": "2.13",
             "current": true
         },
+        {
+            "name": "2.12",
+            "slug": "2.12",
+            "maintained": false
+        },
         {
             "name": "2.11",
-            "branchName": "2.11.x",
             "slug": "2.11",
             "maintained": false
         },
         {
             "name": "2.10",
-            "branchName": "2.10.x",
             "slug": "2.10",
             "maintained": false
         },
         {
             "name": "2.9",
-            "branchName": "2.9.x",
             "slug": "2.9",
             "maintained": false
         },
         {
             "name": "2.8",
-            "branchName": "2.8.x",
             "slug": "2.8",
             "maintained": false
         },
         {
             "name": "2.7",
-            "branchName": "2.7.x",
             "slug": "2.7",
             "maintained": false
         },
         {
             "name": "2.6",
-            "branchName": "2.6.x",
             "slug": "2.6",
             "maintained": false
         },
         {
             "name": "2.5",
-            "branchName": "2.5.x",
             "slug": "2.5",
             "maintained": false
         },
         {
             "name": "2.4",
-            "branchName": "2.4.x",
             "slug": "2.4",
             "maintained": false
         },
         {
             "name": "2.3",
-            "branchName": "2.3.x",
             "slug": "2.3",
             "maintained": false
         },
         {
             "name": "2.2",
-            "branchName": "2.2.x",
             "slug": "2.2",
             "maintained": false
         },
         {
             "name": "2.1",
-            "branchName": "2.1.x",
             "slug": "2.1",
             "maintained": false
         },
         {
             "name": "2.0",
-            "branchName": "2.0.x",
             "slug": "2.0",
             "maintained": false
         },
@@ -97,19 +90,16 @@
         },
         {
             "name": "1.2",
-            "branchName": "1.2.x",
             "slug": "1.2",
             "maintained": false
         },
         {
             "name": "1.1",
-            "branchName": "1.1.x",
             "slug": "1.1",
             "maintained": false
         },
         {
             "name": "1.0",
-            "branchName": "1.0.x",
             "slug": "1.0",
             "maintained": false
         }

.gitattributes

@@ -2,15 +2,11 @@
 * text=auto eol=lf
 
 # Exclude non-essential files from dist
-/.github export-ignore
+/.* export-ignore
+/*.dist export-ignore
+/.neon export-ignore
 /docs export-ignore
+/benchmark export-ignore
+/phpbench.json export-ignore
 /tests export-ignore
 /tools export-ignore
-/.doctrine-project.json export-ignore
-/.gitattributes export-ignore
-/.gitignore export-ignore
-/.gitmodules export-ignore
-/.scrutinizer.yml export-ignore
-/phpcs.xml.dist export-ignore
-/phpstan.neon.dist export-ignore
-/phpunit.xml.dist export-ignore

.github/workflows/atlas-ci.yml

@@ -0,0 +1,99 @@
+name: "Atlas CI"
+
+on:
+  pull_request:
+    branches:
+      - "*.x"
+      - "feature/*"
+  push:
+
+jobs:
+  atlas-local:
+    runs-on: "ubuntu-latest"
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version:
+          - "8.4"
+        symfony:
+          - "stable"
+        proxy:
+          - "lazy-ghost"
+        include:
+          # Test with ProxyManager
+          - php-version: "8.1"
+            symfony: "6.4"
+            proxy: "proxy-manager"
+            os: "ubuntu-latest"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v5"
+        with:
+          fetch-depth: 2
+
+      - name: "Create MongoDB Atlas Local"
+        run: |
+          docker run --name mongodb -p 27017:27017 --detach mongodb/mongodb-atlas-local:8.2
+          until docker exec --tty mongodb mongosh --eval "db.runCommand({ ping: 1 })"; do
+            sleep 1
+          done
+          until docker exec --tty mongodb mongosh --eval "db.createCollection('connection_test') && db.getCollection('connection_test').createSearchIndex({mappings:{dynamic: true}})"; do
+            sleep 1
+          done
+
+      - name: "Show MongoDB server status"
+        run: |
+          docker exec --tty mongodb mongosh --eval "db.runCommand({ serverStatus: 1 })"
+
+      - name: Setup cache environment
+        id: extcache
+        uses: shivammathur/cache-extensions@v1
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: "mongodb, bcmath"
+          key: "extcache-v1"
+
+      - name: Cache extensions
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.extcache.outputs.dir }}
+          key: ${{ steps.extcache.outputs.key }}
+          restore-keys: ${{ steps.extcache.outputs.key }}
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php-version }}"
+          tools: "pecl"
+          extensions: "mongodb, bcmath"
+          coverage: "none"
+          ini-values: "zend.assertions=1"
+
+      - name: "Show driver information"
+        run: "php --ri mongodb"
+
+      # Not used, skip transient dependencies
+      - name: "Remove phpbench/phpbench"
+        run: composer remove --no-update --dev phpbench/phpbench
+
+      - name: "Configure Symfony ${{ matrix.symfony }}"
+        if: "${{ matrix.symfony != 'stable' }}"
+        run: |
+          composer config minimum-stability dev
+          # update symfony deps
+          composer require --no-update symfony/console:^${{ matrix.symfony }}
+          composer require --no-update symfony/var-dumper:^${{ matrix.symfony }}
+          composer require --no-update --dev symfony/cache:^${{ matrix.symfony }}
+
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v3"
+        with:
+          dependency-versions: "highest"
+          composer-options: "--prefer-dist"
+
+      - name: "Run PHPUnit with Atlas Local"
+        run: "vendor/bin/phpunit --group atlas"
+        env:
+          DOCTRINE_MONGODB_SERVER: "mongodb://127.0.0.1:27017/?directConnection=true"
+          USE_LAZY_GHOST_OBJECTS: ${{ matrix.proxy == 'lazy-ghost' && '1' || '0' }}

.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.3.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@12.0.0"

.github/workflows/continuous-integration.yml

@@ -148,7 +148,7 @@ jobs:
           composer-options: "--prefer-dist"
 
       - name: "Install latest Python version"
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.13'
 
@@ -159,7 +159,7 @@ jobs:
           topology: ${{ matrix.topology }}
 
       - name: "Run PHPUnit"
-        run: "vendor/bin/phpunit"
+        run: "vendor/bin/phpunit --exclude-group=atlas"
         env:
           DOCTRINE_MONGODB_SERVER: ${{ steps.setup-mongodb.outputs.cluster-uri }}
           USE_LAZY_GHOST_OBJECTS: ${{ matrix.proxy == 'lazy-ghost' && '1' || '0' }}"

.github/workflows/documentation.yml

@@ -15,30 +15,6 @@ on:
       - docs/**
 
 jobs:
-  validate-with-guides:
-    name: "Validate documentation with phpDocumentor/guides"
-    runs-on: "ubuntu-24.04"
-
-    steps:
-      - name: "Checkout code"
-        uses: "actions/checkout@v5"
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          coverage: "none"
-          php-version: "8.3"
-
-      - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v3"
-        with:
-          working-directory: "docs"
-          dependency-versions: "highest"
-
-      - name: "Add orphan metadata where needed"
-        run: |
-          printf '%s\n\n%s\n' ":orphan:" "$(cat docs/en/sidebar.rst)" > docs/en/sidebar.rst
-          printf '%s\n\n%s\n' ":orphan:" "$(cat docs/en/reference/annotations-reference.rst)" > docs/en/reference/annotations-reference.rst
-
-      - name: "Run guides-cli"
-        run: "docs/vendor/bin/guides -vvv --no-progress docs/en 2>&1 | grep -v 'No template found for rendering directive' | ( ! grep WARNING )"
+  documentation:
+    name: "Generate documentation"
+    uses: "doctrine/.github/.github/workflows/[email protected]"

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

@@ -8,7 +8,9 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/[email protected]"
+    uses: "doctrine/.github/.github/workflows/[email protected]"
+    with:
+      use-next-minor-as-default-branch: true
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.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.3.0"
+    uses: "doctrine/.github/.github/workflows/website-schema.yml@12.0.0"

.gitignore

@@ -1,3 +1,4 @@
+docs/output
 tools/sandbox/Proxies/*
 tools/sandbox/Hydrators/*
 tools/sandbox/PersistentCollections/*

UPGRADE-3.0.md

@@ -14,6 +14,11 @@ The `Doctrine\ODM\MongoDB\Id\AbstractIdGenerator` class has been removed. Custom
 ID generators must implement the `Doctrine\ODM\MongoDB\Id\IdGenerator`
 interface.
 
+The `Doctrine\ODM\MongoDB\Id\UuidGenerator` class has been removed. Use a custom
+generator to generate string UUIDs. For more efficient storage of UUIDs, use the
+`Doctrine\ODM\MongoDB\Types\BinaryUuidType` type in combination with the
+`Doctrine\ODM\MongoDB\Id\SymfonyUuidGenerator` generator.
+
 ## Metadata
 The `Doctrine\ODM\MongoDB\Mapping\ClassMetadata` class has been marked final and
 will no longer be extendable.

composer.json

@@ -20,6 +20,9 @@
         { "name": "Ion Bazan", "email": "[email protected]" },
         { "name": "Fran Moreno", "email": "[email protected]" }
     ],
+    "scripts": {
+        "docs": "composer update -d docs && ./docs/vendor/bin/build-docs.sh @additional_args"
+    },
     "require": {
         "php": "^8.1",
         "ext-mongodb": "^1.21 || ^2.0",
@@ -40,16 +43,17 @@
     "require-dev": {
         "ext-bcmath": "*",
         "doctrine/annotations": "^1.12 || ^2.0",
-        "doctrine/coding-standard": "^12.0",
+        "doctrine/coding-standard": "^14.0",
         "doctrine/orm": "^3.2",
         "jmikola/geojson": "^1.0",
         "phpbench/phpbench": "^1.0.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"
+        "phpunit/phpunit": "^10.5.58",
+        "squizlabs/php_codesniffer": "^4",
+        "symfony/cache": "^5.4 || ^6.0 || ^7.0",
+        "symfony/uid": "^5.4 || ^6.0 || ^7.0"
     },
     "conflict": {
         "doctrine/annotations": "<1.12 || >=3.0"

docker-compose.yaml

@@ -0,0 +1,7 @@
+version: '3.8'
+
+services:
+  mongodb-atlas-local:
+    image: mongodb/mongodb-atlas-local
+    ports:
+      - "27018:27017"

docs/composer.json

@@ -1,5 +1,5 @@
 {
     "require-dev": {
-        "phpdocumentor/guides-cli": "^1.2"
+        "doctrine/docs-builder": "^1.0.3"
     }
 }