Allow classname in 'value' attribute of xml discriminator-mapping field

.doctrine-project.json

@@ -94,42 +94,6 @@
             "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",
-            "slug": "2.7",
-            "maintained": false
-        },
-        {
-            "name": "2.6",
-            "branchName": "2.6",
-            "slug": "2.6",
-            "maintained": false
-        },
-        {
-            "name": "2.5",
-            "branchName": "2.5",
-            "slug": "2.5",
-            "maintained": false
-        },
-        {
-            "name": "2.4",
-            "branchName": "2.4",
-            "slug": "2.4",
-            "maintained": false
         }
     ]
 }

.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "CI"
+    target-branch: "2.19.x"

.github/workflows/continuous-integration.yml

@@ -33,32 +33,27 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.2"
-          - "7.3"
-          - "7.4"
-          - "8.0"
           - "8.1"
           - "8.2"
           - "8.3"
         dbal-version:
           - "default"
+          - "3.7"
         extension:
+          - "sqlite3"
           - "pdo_sqlite"
-        proxy:
-          - "common"
+        deps:
+          - "highest"
         include:
-          - php-version: "8.0"
-            dbal-version: "2.13"
-            extension: "pdo_sqlite"
           - php-version: "8.2"
-            dbal-version: "3@dev"
+            dbal-version: "4@dev"
             extension: "pdo_sqlite"
           - php-version: "8.2"
-            dbal-version: "default"
+            dbal-version: "4@dev"
             extension: "sqlite3"
           - php-version: "8.1"
             dbal-version: "default"
-            proxy: "lazy-ghost"
+            deps: "lowest"
             extension: "pdo_sqlite"
 
     steps:
@@ -83,23 +78,22 @@ jobs:
         uses: "ramsey/composer-install@v2"
         with:
           composer-options: "--ignore-platform-req=php+"
+          dependency-versions: "${{ matrix.deps }}"
 
       - name: "Run PHPUnit"
         run: "vendor/bin/phpunit -c ci/github/phpunit/${{ matrix.extension }}.xml --coverage-clover=coverage-no-cache.xml"
         env:
             ENABLE_SECOND_LEVEL_CACHE: 0
-            ORM_PROXY_IMPLEMENTATION: "${{ matrix.proxy }}"
 
       - name: "Run PHPUnit with Second Level Cache"
         run: "vendor/bin/phpunit -c ci/github/phpunit/${{ matrix.extension }}.xml --exclude-group performance,non-cacheable,locking_functional --coverage-clover=coverage-cache.xml"
         env:
             ENABLE_SECOND_LEVEL_CACHE: 1
-            ORM_PROXY_IMPLEMENTATION: "${{ matrix.proxy }}"
 
       - name: "Upload coverage file"
         uses: "actions/upload-artifact@v4"
         with:
-          name: "phpunit-${{ matrix.extension }}-${{ matrix.php-version }}-${{ matrix.dbal-version }}-${{ matrix.proxy }}-coverage"
+          name: "phpunit-${{ matrix.extension }}-${{ matrix.php-version }}-${{ matrix.dbal-version }}-${{ matrix.deps }}-coverage"
           path: "coverage*.xml"
 
 
@@ -115,19 +109,19 @@ jobs:
           - "8.3"
         dbal-version:
           - "default"
-          - "3@dev"
+          - "3.7"
         postgres-version:
           - "15"
         extension:
           - pdo_pgsql
           - pgsql
         include:
-          - php-version: "8.0"
-            dbal-version: "2.13"
+          - php-version: "8.2"
+            dbal-version: "4@dev"
             postgres-version: "14"
             extension: pdo_pgsql
           - php-version: "8.2"
-            dbal-version: "default"
+            dbal-version: "3.7"
             postgres-version: "9.6"
             extension: pdo_pgsql
 
@@ -188,17 +182,13 @@ jobs:
           - "8.3"
         dbal-version:
           - "default"
-          - "3@dev"
+          - "3.7"
+          - "4@dev"
         mariadb-version:
           - "10.9"
         extension:
           - "mysqli"
           - "pdo_mysql"
-        include:
-          - php-version: "8.0"
-            dbal-version: "2.13"
-            mariadb-version: "10.6"
-            extension: "pdo_mysql"
 
     services:
       mariadb:
@@ -258,16 +248,20 @@ jobs:
           - "8.3"
         dbal-version:
           - "default"
-          - "3@dev"
+          - "3.7"
         mysql-version:
           - "5.7"
           - "8.0"
         extension:
           - "mysqli"
           - "pdo_mysql"
         include:
-          - php-version: "8.0"
-            dbal-version: "2.13"
+          - php-version: "8.2"
+            dbal-version: "4@dev"
+            mysql-version: "8.0"
+            extension: "mysqli"
+          - php-version: "8.2"
+            dbal-version: "4@dev"
             mysql-version: "8.0"
             extension: "pdo_mysql"
 
@@ -322,40 +316,6 @@ jobs:
           name: "${{ github.job }}-${{ matrix.mysql-version }}-${{ matrix.extension }}-${{ matrix.php-version }}-${{ matrix.dbal-version }}-coverage"
           path: "coverage*.xml"
 
-
-  phpunit-lower-php-versions:
-    name: "PHPUnit with SQLite"
-    runs-on: "ubuntu-22.04"
-
-    strategy:
-      matrix:
-        php-version:
-          - "7.1"
-        deps:
-          - "highest"
-          - "lowest"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v4"
-        with:
-          fetch-depth: 2
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          php-version: "${{ matrix.php-version }}"
-          ini-values: "zend.assertions=1, apc.enable_cli=1"
-
-      - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
-        with:
-          dependency-versions: "${{ matrix.deps }}"
-
-      - name: "Run PHPUnit"
-        run: "vendor/bin/phpunit -c ci/github/phpunit/pdo_sqlite.xml"
-
-
   upload_coverage:
     name: "Upload coverage to Codecov"
     runs-on: "ubuntu-22.04"

.github/workflows/phpbench.yml

@@ -32,7 +32,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
+          - "8.1"
 
     steps:
       - name: "Checkout"
@@ -47,15 +47,8 @@ jobs:
           coverage: "pcov"
           ini-values: "zend.assertions=1, apc.enable_cli=1"
 
-      - name: "Cache dependencies installed with composer"
-        uses: "actions/cache@v3"
-        with:
-          path: "~/.composer/cache"
-          key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
-
-      - name: "Install dependencies with composer"
-        run: "composer update --no-interaction --no-progress"
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v3"
 
       - name: "Run PHPBench"
         run: "vendor/bin/phpbench run --report=default"

.github/workflows/static-analysis.yml

@@ -24,80 +24,66 @@ on:
 
 jobs:
   static-analysis-phpstan:
-    name: "Static Analysis with PHPStan"
-    runs-on: "ubuntu-22.04"
+    name: Static Analysis with PHPStan
+    runs-on: ubuntu-22.04
 
     strategy:
-      fail-fast: false
       matrix:
-        dbal-version:
-          - "default"
-        persistence-version:
-          - "default"
         include:
-          - dbal-version: "2.13"
-            persistence-version: "default"
-          - dbal-version: "default"
-            persistence-version: "2.5"
+        - dbal-version: default
+          config: phpstan.neon
+        - dbal-version: 3.8.2
+          config: phpstan-dbal3.neon
 
     steps:
       - name: "Checkout code"
         uses: "actions/checkout@v4"
 
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
         with:
-          coverage: "none"
+          coverage: none
           php-version: "8.3"
+          tools: cs2pr
 
-      - name: "Require specific DBAL version"
+      - name: Require specific DBAL version
         run: "composer require doctrine/dbal ^${{ matrix.dbal-version }} --no-update"
         if: "${{ matrix.dbal-version != 'default' }}"
 
-      - name: "Require specific persistence version"
-        run: "composer require doctrine/persistence ^$([ ${{ matrix.persistence-version }} = default ] && echo '3.1' || echo ${{ matrix.persistence-version }}) --no-update"
-
-      - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
-        with:
-          dependency-versions: "highest"
 
-      - name: "Run a static analysis with phpstan/phpstan"
-        run: "vendor/bin/phpstan analyse"
-        if: "${{ matrix.dbal-version == 'default' && matrix.persistence-version == 'default'}}"
+      - name: Install dependencies with Composer
+        uses: ramsey/composer-install@v2
 
-      - name: "Run a static analysis with phpstan/phpstan"
-        run: "vendor/bin/phpstan analyse -c phpstan-dbal2.neon"
-        if: "${{ matrix.dbal-version == '2.13' }}"
-
-      - name: "Run a static analysis with phpstan/phpstan"
-        run: "vendor/bin/phpstan analyse -c phpstan-persistence2.neon"
-        if: "${{ matrix.dbal-version == 'default' && matrix.persistence-version != 'default'}}"
+      - name: Run static analysis with phpstan/phpstan
+        run: "vendor/bin/phpstan analyse -c ${{ matrix.config }} --error-format=checkstyle | cs2pr"
 
   static-analysis-psalm:
-    name: "Static Analysis with Psalm"
-    runs-on: "ubuntu-22.04"
+    name: Static Analysis with Psalm
+    runs-on: ubuntu-22.04
 
     strategy:
-      fail-fast: false
+      matrix:
+        dbal-version:
+        - default
+        - 3.8.2
 
     steps:
       - name: "Checkout code"
         uses: "actions/checkout@v4"
 
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
         with:
-          coverage: "none"
+          coverage: none
           php-version: "8.3"
+          tools: cs2pr
 
-      - name: "Require specific persistence version"
-        run: "composer require doctrine/persistence ^3.1 --no-update"
+      - name: Require specific DBAL version
+        run: "composer require doctrine/dbal ^${{ matrix.dbal-version }} --no-update"
+        if: "${{ matrix.dbal-version != 'default' }}"
 
-      - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
-        with:
-          dependency-versions: "highest"
+      - name: Install dependencies with Composer
+        uses: ramsey/composer-install@v2
 
-      - name: "Run a static analysis with vimeo/psalm"
-        run: "vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc)"
+      - name: Run static analysis with Vimeo Psalm
+        run: vendor/bin/psalm --shepherd

CONTRIBUTING.md

@@ -57,7 +57,7 @@ sqlite database.
 Tips for creating unit tests:
 
 1. If you put a test into the `Ticket` namespace as described above, put the testcase and all entities into the same class.
-   See `https://github.com/doctrine/orm/tree/2.8.x/tests/Tests/ORM/Functional/Ticket/DDC2306Test.php` for an
+   See `https://github.com/doctrine/orm/tree/3.0.x/tests/Tests/ORM/Functional/Ticket/DDC2306Test.php` for an
    example.
 
 ## Getting merged

README.md

@@ -5,7 +5,7 @@
 
 [<h1 align="center">🇺🇦 UKRAINE NEEDS YOUR HELP NOW!</h1>](https://www.doctrine-project.org/stop-war.html)
 
-Doctrine ORM is an object-relational mapper for PHP 7.1+ that provides transparent persistence
+Doctrine ORM is an object-relational mapper for PHP 8.1+ that provides transparent persistence
 for PHP objects. It sits on top of a powerful database abstraction layer (DBAL). One of its key features
 is the option to write database queries in a proprietary object oriented SQL dialect called Doctrine Query Language (DQL),
 inspired by Hibernate's HQL. This provides developers with a powerful alternative to SQL that maintains flexibility