Merge 2.19.x and 3.1.x up into 3.2.x

.doctrine-project.json

@@ -10,17 +10,22 @@
       "slug": "latest",
       "upcoming": true
     },
+    {
+      "name": "3.2",
+      "branchName": "3.2.x",
+      "slug": "3.2",
+      "upcoming": true
+    },
     {
       "name": "3.1",
       "branchName": "3.1.x",
       "slug": "3.1",
-      "upcoming": true
+      "current": true
     },
     {
       "name": "3.0",
-      "branchName": "3.0.x",
       "slug": "3.0",
-      "current": true
+      "maintained": false
     },
     {
       "name": "2.19",
@@ -34,12 +39,6 @@
       "slug": "2.18",
       "maintained": true
     },
-    {
-      "name": "2.17",
-      "branchName": "2.17.x",
-      "slug": "2.17",
-      "maintained": false
-    },
     {
       "name": "2.16",
       "slug": "2.16",
@@ -75,16 +74,6 @@
       "slug": "2.10",
       "maintained": false
     },
-    {
-      "name": "2.9",
-      "slug": "2.9",
-      "maintained": false
-    },
-    {
-      "name": "2.8",
-      "slug": "2.8",
-      "maintained": false
-    },
     {
       "name": "2.7",
       "slug": "2.7",
@@ -95,31 +84,6 @@
       "slug": "2.6",
       "maintained": false
     },
-    {
-      "name": "2.5",
-      "slug": "2.5",
-      "maintained": false
-    },
-    {
-      "name": "2.4",
-      "slug": "2.4",
-      "maintained": false
-    },
-    {
-      "name": "2.3",
-      "slug": "2.3",
-      "maintained": false
-    },
-    {
-      "name": "2.2",
-      "slug": "2.2",
-      "maintained": false
-    },
-    {
-      "name": "2.1",
-      "slug": "2.1",
-      "maintained": false
-    },
     {
       "name": "2.0",
       "slug": "2.0",
@@ -129,61 +93,6 @@
       "name": "1.12",
       "slug": "1.12",
       "maintained": false
-    },
-    {
-      "name": "1.11",
-      "slug": "1.11",
-      "maintained": false
-    },
-    {
-      "name": "1.10",
-      "slug": "1.10",
-      "maintained": false
-    },
-    {
-      "name": "1.9",
-      "slug": "1.9",
-      "maintained": false
-    },
-    {
-      "name": "1.8",
-      "slug": "1.8",
-      "maintained": false
-    },
-    {
-      "name": "1.7",
-      "slug": "1.7",
-      "maintained": false
-    },
-    {
-      "name": "1.6",
-      "slug": "1.6",
-      "maintained": false
-    },
-    {
-      "name": "1.5",
-      "slug": "1.5",
-      "maintained": false
-    },
-    {
-      "name": "1.4",
-      "slug": "1.4",
-      "maintained": false
-    },
-    {
-      "name": "1.3",
-      "slug": "1.3",
-      "maintained": false
-    },
-    {
-      "name": "1.2",
-      "slug": "1.2",
-      "maintained": false
-    },
-    {
-      "name": "1.1",
-      "slug": "1.1",
-      "maintained": false
     }
   ]
 }

.github/workflows/coding-standards.yml

@@ -26,6 +26,6 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@v12.2.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@13.1.0"
     with:
       composer-options: "--prefer-dist --prefer-stable"

.github/workflows/composer-lint.yml

@@ -17,4 +17,4 @@ on:
 jobs:
   composer-lint:
     name: "Composer Lint"
-    uses: "doctrine/.github/.github/workflows/composer-lint.yml@v12.2.0"
+    uses: "doctrine/.github/.github/workflows/composer-lint.yml@13.1.0"

.github/workflows/continuous-integration.yml

@@ -1,5 +1,4 @@
-
-name: "Continuous Integration"
+name: "CI: PHPUnit"
 
 on:
   pull_request:
@@ -27,7 +26,15 @@ on:
 
 jobs:
   phpunit:
-    name: "PHPUnit"
+    name: >
+      ${{ format('PHP {0} - Sf {1} - deps {2} - stab. {3}',
+        matrix.php-version || 'Ø',
+        matrix.symfony-require || 'Ø',
+        matrix.dependencies || 'Ø',
+        matrix.stability || 'Ø'
+      ) }}
+      ${{ matrix.remove-orm && ' - remove ORM' }}
+      ${{ matrix.remove-doctrine-messenger && ' - remove Messenger' }}
     runs-on: "ubuntu-latest"
     env:
       SYMFONY_REQUIRE: ${{matrix.symfony-require}}
@@ -88,7 +95,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
         with:
           fetch-depth: 2
 
@@ -123,7 +130,7 @@ jobs:
         run: "vendor/bin/phpunit --coverage-clover=coverage.xml"
 
       - name: "Upload coverage file"
-        uses: "actions/upload-artifact@v5"
+        uses: "actions/upload-artifact@v6"
         with:
           name: "phpunit-${{ matrix.php-version }}-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}.coverage"
           path: "coverage.xml"
@@ -138,12 +145,12 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
         with:
           fetch-depth: 2
 
       - name: "Download coverage files"
-        uses: "actions/download-artifact@v6"
+        uses: "actions/download-artifact@v7"
         with:
           path: "reports"
 

.github/workflows/documentation.yml

@@ -17,4 +17,4 @@ on:
 jobs:
   documentation:
     name: "Documentation"
-    uses: "doctrine/.github/.github/workflows/documentation.yml@v12.2.0"
+    uses: "doctrine/.github/.github/workflows/documentation.yml@13.1.0"

.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@v12.2.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@13.1.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/test-dev-stability.yml

@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
         with:
           fetch-depth: 2
 

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

.symfony.bundle.yaml

@@ -1,28 +1,25 @@
 branches:
-    - "2.5.x"
     - "2.6.x"
     - "2.7.x"
-    - "2.8.x"
-    - "2.9.x"
     - "2.10.x"
     - "2.11.x"
     - "2.12.x"
     - "2.13.x"
     - "2.14.x"
     - "2.15.x"
     - "2.16.x"
-    - "2.17.x"
     - "2.18.x"
     - "2.19.x"
     - "3.0.x"
     - "3.1.x"
+    - "3.2.x"
     - "4.0.x"
 maintained_branches:
     - "2.18.x"
     - "2.19.x"
-    - "3.0.x"
     - "3.1.x"
+    - "3.2.x"
     - "4.0.x"
 doc_dir: "docs/en/"
-current_branch: "3.0.x"
-dev_branch: "3.1.x"
+current_branch: "3.1.x"
+dev_branch: "3.2.x"

UPGRADE-2.19.md

@@ -0,0 +1,17 @@
+UPGRADE FROM 2.18 to 2.19
+=========================
+
+Configuration
+-------------
+
+### Proxy-related configuration settings are conditionally deprecated
+
+When using PHP 8.4 or higher in combination with Doctrine ORM 3.4 or
+higher, the following configuration settings are deprecated:
+
+- `auto_generate_proxy_classes`
+- `proxy_namespace`
+- `proxy_dir`
+
+Instead, they should be unset, and `enable_native_lazy_objects` should
+be set to `true`.

composer.json

@@ -60,14 +60,12 @@
         "symfony/string": "^6.4 || ^7.0 || ^8.0",
         "symfony/twig-bridge": "^6.4 || ^7.0 || ^8.0",
         "symfony/validator": "^6.4 || ^7.0 || ^8.0",
-        "symfony/var-exporter": "^6.4.1 || ^7.0.1 || ^8.0",
         "symfony/web-profiler-bundle": "^6.4 || ^7.0 || ^8.0",
         "symfony/yaml": "^6.4 || ^7.0 || ^8.0",
         "twig/twig": "^3.21.1"
     },
     "conflict": {
         "doctrine/orm": "<3.0 || >=4.0",
-        "symfony/var-exporter": "< 6.4.1 || 7.0.0",
         "twig/twig": "<3.0.4"
     },
     "suggest": {

docs/en/doctrine-console.rst

@@ -0,0 +1,71 @@
+Doctrine Console
+================
+
+Some Doctrine packages such as ``doctrine/dbal`` and ``doctrine/orm``
+provide useful console commands to interact with your database and your
+entities:
+
+- `Doctrine DBAL Commands
+  <https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/cli-tools.html#cli-tools>`_
+- `Doctrine ORM Commands
+  <https://www.doctrine-project.org/projects/doctrine-orm/en/latest/reference/tools.html#doctrine-console>`_
+
+This bundle automatically registers those commands, but it renames them
+in the process so as to group them under the ``doctrine:`` namespace.
+
+Note that the bundle also provide some additional commands that are not
+part of the aforementioned packages.
+
+Command Name Mapping
+--------------------
+
+The following table shows the mapping between the original Doctrine command
+names and the names used by this bundle:
+
++--------------------------------------------+---------------------------------------+
+| Bundle Command Name                        | Original Doctrine Command Name        |
++============================================+=======================================+
+| ``doctrine:cache:clear-metadata``          | ``orm:clear-cache:metadata``          |
++--------------------------------------------+---------------------------------------+
+| ``doctrine:cache:clear-query``             | ``orm:clear-cache:query``             |
++--------------------------------------------+---------------------------------------+
+| ``doctrine:cache:clear-result``            | ``orm:clear-cache:result``            |
++--------------------------------------------+---------------------------------------+
+| ``doctrine:cache:clear-collection-region`` | ``orm:clear-cache:region:collection`` |
++--------------------------------------------+---------------------------------------+
+| ``doctrine:cache:clear-entity-region``     | ``orm:clear-cache:region:entity``     |
++--------------------------------------------+---------------------------------------+
+| ``doctrine:cache:clear-query-region``      | ``orm:clear-cache:region:query``      |
++--------------------------------------------+---------------------------------------+
+| ``doctrine:schema:create``                 | ``orm:schema-tool:create``            |
++--------------------------------------------+---------------------------------------+
+| ``doctrine:schema:drop``                   | ``orm:schema-tool:drop``              |
++--------------------------------------------+---------------------------------------+
+| ``doctrine:schema:update``                 | ``orm:schema-tool:update``            |
++--------------------------------------------+---------------------------------------+
+| ``doctrine:mapping:info``                  | ``orm:info``                          |
++--------------------------------------------+---------------------------------------+
+| ``doctrine:mapping:describe``              | ``orm:mapping:describe``              |
++--------------------------------------------+---------------------------------------+
+| ``doctrine:query:dql``                     | ``orm:run-dql``                       |
++--------------------------------------------+---------------------------------------+
+| ``doctrine:schema:validate``               | ``orm:validate-schema``               |
++--------------------------------------------+---------------------------------------+
+
+Additionally, the bundle provides the following commands:
+
+- ``doctrine:database:create``
+- ``doctrine:database:drop``
+
+To get a list of all available Doctrine commands, run:
+
+.. code-block:: console
+
+    php bin/console list doctrine
+
+It is possible to get help on any specific command. For example,
+to get help on the ``doctrine:schema:update`` command, run:
+
+.. code-block:: console
+
+    php bin/console doctrine:schema:update --help

docs/en/index.rst

@@ -7,6 +7,7 @@ configuration options, console commands and even a web debug toolbar collector.
 .. toctree::
 
     installation
+    doctrine-console
     entity-listeners
     event-listeners
     custom-id-generators