From 29fef83b32c7b5c0145f9719665f0ab2ab222c29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 15:39:31 +0000 Subject: [PATCH 01/17] Bump doctrine/.github/.github/workflows/coding-standards.yml Bumps [doctrine/.github/.github/workflows/coding-standards.yml](https://github.com/doctrine/.github) from 12.2.0 to 13.0.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/v12.2.0...13.0.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/coding-standards.yml dependency-version: 13.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/coding-standards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 8e159f1d5..82c244e4b 100644 --- a/.github/workflows/coding-standards.yml +++ b/.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.0.0" with: composer-options: "--prefer-dist --prefer-stable" From c3f19e47a01e2b94696a6ec5246bf4c9f02780f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 15:39:33 +0000 Subject: [PATCH 02/17] Bump doctrine/.github/.github/workflows/phpstan.yml Bumps [doctrine/.github/.github/workflows/phpstan.yml](https://github.com/doctrine/.github) from 12.2.0 to 13.0.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/v12.2.0...13.0.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/phpstan.yml dependency-version: 13.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/static-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 19cd93448..a57e8bcbc 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -26,4 +26,4 @@ on: jobs: static-analysis: name: "Static Analysis" - uses: "doctrine/.github/.github/workflows/phpstan.yml@v12.2.0" + uses: "doctrine/.github/.github/workflows/phpstan.yml@13.0.0" From 808418392e675ff39b3c040f8858ab4e9d04eafb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 15:39:35 +0000 Subject: [PATCH 03/17] Bump doctrine/.github/.github/workflows/release-on-milestone-closed.yml Bumps [doctrine/.github/.github/workflows/release-on-milestone-closed.yml](https://github.com/doctrine/.github) from 12.2.0 to 13.0.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/v12.2.0...13.0.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/release-on-milestone-closed.yml dependency-version: 13.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/release-on-milestone-closed.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml index 634210120..1950b3b56 100644 --- a/.github/workflows/release-on-milestone-closed.yml +++ b/.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.0.0" secrets: GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }} GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }} From 8fd88476dea804d15b9c28c532eebaa810c37170 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 15:39:37 +0000 Subject: [PATCH 04/17] Bump doctrine/.github/.github/workflows/website-schema.yml Bumps [doctrine/.github/.github/workflows/website-schema.yml](https://github.com/doctrine/.github) from 12.2.0 to 13.0.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/v12.2.0...13.0.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/website-schema.yml dependency-version: 13.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/website-schema.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/website-schema.yml b/.github/workflows/website-schema.yml index 80312010a..0e3da60a2 100644 --- a/.github/workflows/website-schema.yml +++ b/.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.0.0" From 295cffae04b2eef41d8ca9b8ce012099c1d2d83c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 15:39:39 +0000 Subject: [PATCH 05/17] Bump doctrine/.github/.github/workflows/documentation.yml Bumps [doctrine/.github/.github/workflows/documentation.yml](https://github.com/doctrine/.github) from 12.2.0 to 13.0.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/v12.2.0...13.0.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/documentation.yml dependency-version: 13.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 7722f764f..532d935a2 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -17,4 +17,4 @@ on: jobs: documentation: name: "Documentation" - uses: "doctrine/.github/.github/workflows/documentation.yml@v12.2.0" \ No newline at end of file + uses: "doctrine/.github/.github/workflows/documentation.yml@13.0.0" \ No newline at end of file From 325266eff3379f6e54fe7cc2b0edfd4e85afab0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 29 Nov 2025 09:59:14 +0000 Subject: [PATCH 06/17] Bump doctrine/.github/.github/workflows/documentation.yml Bumps [doctrine/.github/.github/workflows/documentation.yml](https://github.com/doctrine/.github) from 13.0.0 to 13.1.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/13.0.0...13.1.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/documentation.yml dependency-version: 13.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 532d935a2..defe5c5b6 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -17,4 +17,4 @@ on: jobs: documentation: name: "Documentation" - uses: "doctrine/.github/.github/workflows/documentation.yml@13.0.0" \ No newline at end of file + uses: "doctrine/.github/.github/workflows/documentation.yml@13.1.0" \ No newline at end of file From 33f49a6d94792eab433c2aeddecc1ee678c83db7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 29 Nov 2025 09:59:16 +0000 Subject: [PATCH 07/17] Bump doctrine/.github/.github/workflows/phpstan.yml Bumps [doctrine/.github/.github/workflows/phpstan.yml](https://github.com/doctrine/.github) from 13.0.0 to 13.1.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/13.0.0...13.1.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/phpstan.yml dependency-version: 13.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/static-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index a57e8bcbc..c45d0a6ac 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -26,4 +26,4 @@ on: jobs: static-analysis: name: "Static Analysis" - uses: "doctrine/.github/.github/workflows/phpstan.yml@13.0.0" + uses: "doctrine/.github/.github/workflows/phpstan.yml@13.1.0" From 26e43ee966906920c5d81fcfd7f1eb7edfb503b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 29 Nov 2025 09:59:18 +0000 Subject: [PATCH 08/17] Bump doctrine/.github/.github/workflows/website-schema.yml Bumps [doctrine/.github/.github/workflows/website-schema.yml](https://github.com/doctrine/.github) from 13.0.0 to 13.1.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/13.0.0...13.1.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/website-schema.yml dependency-version: 13.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/website-schema.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/website-schema.yml b/.github/workflows/website-schema.yml index 0e3da60a2..7746acb4c 100644 --- a/.github/workflows/website-schema.yml +++ b/.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@13.0.0" + uses: "doctrine/.github/.github/workflows/website-schema.yml@13.1.0" From fba370a5775728b830d1d5eeea39a51bb1ad0966 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 29 Nov 2025 09:59:19 +0000 Subject: [PATCH 09/17] Bump doctrine/.github/.github/workflows/release-on-milestone-closed.yml Bumps [doctrine/.github/.github/workflows/release-on-milestone-closed.yml](https://github.com/doctrine/.github) from 13.0.0 to 13.1.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/13.0.0...13.1.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/release-on-milestone-closed.yml dependency-version: 13.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/release-on-milestone-closed.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml index 1950b3b56..b82f876ec 100644 --- a/.github/workflows/release-on-milestone-closed.yml +++ b/.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@13.0.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 }} From 5dce423346cf959da7d53e0efae5b74e5dceff0c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 29 Nov 2025 09:59:21 +0000 Subject: [PATCH 10/17] Bump doctrine/.github/.github/workflows/composer-lint.yml Bumps [doctrine/.github/.github/workflows/composer-lint.yml](https://github.com/doctrine/.github) from 12.2.0 to 13.1.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/v12.2.0...13.1.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/composer-lint.yml dependency-version: 13.1.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/composer-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/composer-lint.yml b/.github/workflows/composer-lint.yml index a9876185a..4fc0e0848 100644 --- a/.github/workflows/composer-lint.yml +++ b/.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" From bd650d41c6651edd4ad93b9ecb9fa15534bd5257 Mon Sep 17 00:00:00 2001 From: Alexis Lefebvre Date: Fri, 28 Nov 2025 00:10:18 +0100 Subject: [PATCH 11/17] chore: show parameters in name of CI jobs --- .github/workflows/continuous-integration.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 1c95434ec..d53858c31 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.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}} From 68c9ab8bf802e5679fd38b332e57ea3405394b91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Dec 2025 15:53:24 +0000 Subject: [PATCH 12/17] Bump doctrine/.github/.github/workflows/coding-standards.yml Bumps [doctrine/.github/.github/workflows/coding-standards.yml](https://github.com/doctrine/.github) from 13.0.0 to 13.1.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/13.0.0...13.1.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/coding-standards.yml dependency-version: 13.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/coding-standards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 82c244e4b..1fdac69e5 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -26,6 +26,6 @@ on: jobs: coding-standards: name: "Coding Standards" - uses: "doctrine/.github/.github/workflows/coding-standards.yml@13.0.0" + uses: "doctrine/.github/.github/workflows/coding-standards.yml@13.1.0" with: composer-options: "--prefer-dist --prefer-stable" From b1054850d73dd1fc18e505e0d03e640db4fb932a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Dec 2025 15:53:28 +0000 Subject: [PATCH 13/17] Bump actions/checkout from 5 to 6 Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/continuous-integration.yml | 4 ++-- .github/workflows/test-dev-stability.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index d53858c31..5f740bef3 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -87,7 +87,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v5" + uses: "actions/checkout@v6" with: fetch-depth: 2 @@ -137,7 +137,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v5" + uses: "actions/checkout@v6" with: fetch-depth: 2 diff --git a/.github/workflows/test-dev-stability.yml b/.github/workflows/test-dev-stability.yml index 82b919db6..b96c7dddd 100644 --- a/.github/workflows/test-dev-stability.yml +++ b/.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 From b5eb5bce074c7c5d738980faaecdd10f1d56c642 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Dec 2025 15:13:03 +0000 Subject: [PATCH 14/17] Bump actions/download-artifact from 6 to 7 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 6 to 7. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/continuous-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 5f740bef3..a6ce35de7 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -142,7 +142,7 @@ jobs: fetch-depth: 2 - name: "Download coverage files" - uses: "actions/download-artifact@v6" + uses: "actions/download-artifact@v7" with: path: "reports" From f7b4bdc16c40c16179e7d3654e9ec80ed65833b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Dec 2025 15:13:07 +0000 Subject: [PATCH 15/17] Bump actions/upload-artifact from 5 to 6 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 5 to 6. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/continuous-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 5f740bef3..0515f38f3 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -122,7 +122,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" From ff26443699ea0f601db219dfcba660a2e5fc2993 Mon Sep 17 00:00:00 2001 From: Julien Tattevin <602252+jtattevin@users.noreply.github.com> Date: Thu, 18 Dec 2025 18:17:47 +0100 Subject: [PATCH 16/17] Detect bundle containing only MappedSuperclass annotations (#2171) --- src/DependencyInjection/DoctrineExtension.php | 2 ++ .../DoctrineExtensionTest.php | 1 + .../Entity/TestAnnotationEntity.php | 16 ++++++++++++++++ .../MappedSuperclassBundle.php | 11 +++++++++++ 4 files changed, 30 insertions(+) create mode 100644 tests/DependencyInjection/Fixtures/Bundles/MappedSuperclassBundle/Entity/TestAnnotationEntity.php create mode 100644 tests/DependencyInjection/Fixtures/Bundles/MappedSuperclassBundle/MappedSuperclassBundle.php diff --git a/src/DependencyInjection/DoctrineExtension.php b/src/DependencyInjection/DoctrineExtension.php index 8d3e40283..591cb0035 100644 --- a/src/DependencyInjection/DoctrineExtension.php +++ b/src/DependencyInjection/DoctrineExtension.php @@ -422,6 +422,7 @@ private function detectMappingType(string $directory, ContainerBuilder $containe if ( preg_match('/^#\[.*' . $quotedMappingObjectName . '\b/m', $content) || preg_match('/^#\[.*Embeddable\b/m', $content) + || preg_match('/^#\[.*MappedSuperclass\b/m', $content) ) { break; } @@ -429,6 +430,7 @@ private function detectMappingType(string $directory, ContainerBuilder $containe if ( self::textContainsAnnotation($quotedMappingObjectName, $content) || self::textContainsAnnotation('Embeddable', $content) + || self::textContainsAnnotation('MappedSuperclass', $content) ) { $type = 'annotation'; break; diff --git a/tests/DependencyInjection/DoctrineExtensionTest.php b/tests/DependencyInjection/DoctrineExtensionTest.php index 1407e9f48..4e70115ce 100644 --- a/tests/DependencyInjection/DoctrineExtensionTest.php +++ b/tests/DependencyInjection/DoctrineExtensionTest.php @@ -1511,6 +1511,7 @@ public function testControllerResolver(bool $simpleEntityManagerConfig): void #[TestWith(['AttributesBundle', 'attribute'], 'Bundle with attributes')] #[TestWith(['RepositoryServiceBundle', 'attribute'], 'Bundle with both')] #[TestWith(['AnnotationsBundle', 'annotation'], 'Bundle with annotations')] + #[TestWith(['MappedSuperclassBundle', 'annotation'], 'Bundle with annotations containing only MappedSuperclass')] #[TestWith(['AttributesWithPackageBundle', 'attribute'], 'Bundle with attributes and @package')] public function testDetectMappingType(string $bundle, string $expectedType, string $vendor = '') { diff --git a/tests/DependencyInjection/Fixtures/Bundles/MappedSuperclassBundle/Entity/TestAnnotationEntity.php b/tests/DependencyInjection/Fixtures/Bundles/MappedSuperclassBundle/Entity/TestAnnotationEntity.php new file mode 100644 index 000000000..dfb3393c8 --- /dev/null +++ b/tests/DependencyInjection/Fixtures/Bundles/MappedSuperclassBundle/Entity/TestAnnotationEntity.php @@ -0,0 +1,16 @@ + Date: Sat, 20 Dec 2025 16:16:39 +0100 Subject: [PATCH 17/17] Document command remapping It is hard to understand why commands advertised in the Doctrine ORM docs are not available in a Symfony application. Let us create a document explaining why things are the way they are, and listing the commands available through the bundle. --- docs/en/doctrine-console.rst | 78 ++++++++++++++++++++++++++++++++++++ docs/en/index.rst | 1 + 2 files changed, 79 insertions(+) create mode 100644 docs/en/doctrine-console.rst diff --git a/docs/en/doctrine-console.rst b/docs/en/doctrine-console.rst new file mode 100644 index 000000000..97dbe3f1b --- /dev/null +++ b/docs/en/doctrine-console.rst @@ -0,0 +1,78 @@ +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 + `_ +- `Doctrine ORM Commands + `_ + +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:query:sql`` | ``dbal:run-sql`` | ++--------------------------------------------+---------------------------------------+ +| ``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:mapping:convert`` | ``orm:convert-mapping`` | ++--------------------------------------------+---------------------------------------+ +| ``doctrine:schema:create`` | ``orm:schema-tool:create`` | ++--------------------------------------------+---------------------------------------+ +| ``doctrine:schema:drop`` | ``orm:schema-tool:drop`` | ++--------------------------------------------+---------------------------------------+ +| ``doctrine:schema:update`` | ``orm:schema-tool:update`` | ++--------------------------------------------+---------------------------------------+ +| ``doctrine:ensure-production-settings`` | ``orm:ensure-production-settings`` | ++--------------------------------------------+---------------------------------------+ +| ``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`` +- ``doctrine:mapping:import`` + +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 diff --git a/docs/en/index.rst b/docs/en/index.rst index a96897086..6e535144f 100644 --- a/docs/en/index.rst +++ b/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