From cc1916f143259033229063a0dbddcce74fb5939d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Mar 2026 15:23:25 +0000 Subject: [PATCH 01/16] Bump actions/upload-artifact from 6 to 7 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 6 to 7. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/upload-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 142bd7292..c838e0ffd 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@v6" + uses: "actions/upload-artifact@v7" with: name: "phpunit-${{ matrix.php-version }}-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}.coverage" path: "coverage.xml" From 94a6c0407ee7af23354a9e202f0d92369426a9a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Mar 2026 15:23:19 +0000 Subject: [PATCH 02/16] Bump actions/download-artifact from 7 to 8 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 7 to 8. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v7...v8) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-version: '8' 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 c838e0ffd..4e8ae889e 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@v7" + uses: "actions/download-artifact@v8" with: path: "reports" From 57a3bf7061b937e6d93d492cbe1dd59f4ce47b76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Mar 2026 15:22:21 +0000 Subject: [PATCH 03/16] Bump doctrine/.github/.github/workflows/coding-standards.yml Bumps [doctrine/.github/.github/workflows/coding-standards.yml](https://github.com/doctrine/.github) from 13.1.0 to 14.0.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/13.1.0...14.0.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/coding-standards.yml dependency-version: 14.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 1fdac69e5..617826f1d 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.1.0" + uses: "doctrine/.github/.github/workflows/coding-standards.yml@14.0.0" with: composer-options: "--prefer-dist --prefer-stable" From 17c304b6f6f206898c00e43b790a3a7153789eb3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Mar 2026 15:22:19 +0000 Subject: [PATCH 04/16] Bump doctrine/.github/.github/workflows/phpstan.yml Bumps [doctrine/.github/.github/workflows/phpstan.yml](https://github.com/doctrine/.github) from 13.1.0 to 14.0.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/13.1.0...14.0.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/phpstan.yml dependency-version: 14.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 c45d0a6ac..e8a7e414f 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.1.0" + uses: "doctrine/.github/.github/workflows/phpstan.yml@14.0.0" From cffa418b909642be4b2994d004adc8a64aef7a1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Mar 2026 15:22:17 +0000 Subject: [PATCH 05/16] Bump doctrine/.github/.github/workflows/documentation.yml Bumps [doctrine/.github/.github/workflows/documentation.yml](https://github.com/doctrine/.github) from 13.1.0 to 14.0.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/13.1.0...14.0.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/documentation.yml dependency-version: 14.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 defe5c5b6..3282d790e 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.1.0" \ No newline at end of file + uses: "doctrine/.github/.github/workflows/documentation.yml@14.0.0" \ No newline at end of file From 1c3c5691d15b04867a86dfbb3c31de5842aec467 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Mar 2026 15:22:11 +0000 Subject: [PATCH 06/16] Bump doctrine/.github/.github/workflows/website-schema.yml Bumps [doctrine/.github/.github/workflows/website-schema.yml](https://github.com/doctrine/.github) from 13.1.0 to 14.0.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/13.1.0...14.0.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/website-schema.yml dependency-version: 14.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 7746acb4c..ccefb1351 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.1.0" + uses: "doctrine/.github/.github/workflows/website-schema.yml@14.0.0" From cafee797ec8f6ce467e09b5ce076231b8639cc7c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Mar 2026 15:22:15 +0000 Subject: [PATCH 07/16] Bump ramsey/composer-install from 3 to 4 Bumps [ramsey/composer-install](https://github.com/ramsey/composer-install) from 3 to 4. - [Release notes](https://github.com/ramsey/composer-install/releases) - [Commits](https://github.com/ramsey/composer-install/compare/v3...v4) --- updated-dependencies: - dependency-name: ramsey/composer-install dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/continuous-integration.yml | 2 +- .github/workflows/test-dev-stability.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 4e8ae889e..7c8639e42 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -113,7 +113,7 @@ jobs: if: "${{ matrix.remove-doctrine-messenger }}" - name: "Install dependencies with Composer" - uses: "ramsey/composer-install@v3" + uses: "ramsey/composer-install@v4" with: dependency-versions: "${{ matrix.dependencies }}" composer-options: "--prefer-dist" diff --git a/.github/workflows/test-dev-stability.yml b/.github/workflows/test-dev-stability.yml index b96c7dddd..7c2a1b279 100644 --- a/.github/workflows/test-dev-stability.yml +++ b/.github/workflows/test-dev-stability.yml @@ -40,7 +40,7 @@ jobs: tools: "flex" - name: "Install dependencies with Composer" - uses: "ramsey/composer-install@v3" + uses: "ramsey/composer-install@v4" with: dependency-versions: "${{ matrix.dependencies }}" composer-options: "--prefer-dist" From f50315b9f530c6dfc0161d5e369dbd2649dd9807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Fri, 27 Mar 2026 09:51:45 +0100 Subject: [PATCH 08/16] Group Doctrine workflow updates together (#2217) We do very small releases, often touching only one workflow, which means it is unlikely to have several issues when attempting to bump several references to this repository. --- .github/dependabot.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b789cbb46..fcdc6020f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,3 +7,7 @@ updates: labels: - "CI" target-branch: "2.18.x" + groups: + doctrine: + patterns: + - "doctrine/*" From e09da413e896ffd4bdadd24f364aba5f4a8dcb91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2026 08:52:29 +0000 Subject: [PATCH 09/16] Bump the doctrine group with 2 updates Bumps the doctrine group with 2 updates: [doctrine/.github/.github/workflows/composer-lint.yml](https://github.com/doctrine/.github) and [doctrine/.github/.github/workflows/release-on-milestone-closed.yml](https://github.com/doctrine/.github). Updates `doctrine/.github/.github/workflows/composer-lint.yml` from 13.1.0 to 14.0.0 - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/13.1.0...14.0.0) Updates `doctrine/.github/.github/workflows/release-on-milestone-closed.yml` from 13.1.0 to 14.0.0 - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/13.1.0...14.0.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/composer-lint.yml dependency-version: 14.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: doctrine - dependency-name: doctrine/.github/.github/workflows/release-on-milestone-closed.yml dependency-version: 14.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: doctrine ... Signed-off-by: dependabot[bot] --- .github/workflows/composer-lint.yml | 2 +- .github/workflows/release-on-milestone-closed.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/composer-lint.yml b/.github/workflows/composer-lint.yml index 4fc0e0848..89b67fe4f 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@13.1.0" + uses: "doctrine/.github/.github/workflows/composer-lint.yml@14.0.0" diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml index b82f876ec..c714aa256 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.1.0" + uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@14.0.0" secrets: GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }} GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }} From 78f87b5c3d9ff20a8a6a0c82fe6c2f39a7d09ead Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2026 08:52:34 +0000 Subject: [PATCH 10/16] Bump codecov/codecov-action from 5 to 6 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 5 to 6. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v5...v6) --- updated-dependencies: - dependency-name: codecov/codecov-action 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 7c8639e42..79e674f67 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -147,7 +147,7 @@ jobs: path: "reports" - name: "Upload to Codecov" - uses: "codecov/codecov-action@v5" + uses: "codecov/codecov-action@v6" with: directory: reports env: From c82193365fe9cdda87bda9c178164068d909261d Mon Sep 17 00:00:00 2001 From: Victor Shi Date: Fri, 27 Mar 2026 10:47:09 +0100 Subject: [PATCH 11/16] Fix region_lifetime not applied to explicitly declared SLC regions --- src/DependencyInjection/Configuration.php | 2 +- src/DependencyInjection/DoctrineExtension.php | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index c55f89c0d..27d1fdc4e 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -604,7 +604,7 @@ private function getOrmEntityManagersNode(): ArrayNodeDefinition ->scalarNode('lock_path')->defaultValue('%kernel.cache_dir%/doctrine/orm/slc/filelock')->end() ->scalarNode('lock_lifetime')->defaultValue(60)->end() ->scalarNode('type')->defaultValue('default')->end() - ->scalarNode('lifetime')->defaultValue(0)->end() + ->scalarNode('lifetime')->defaultNull()->end() ->scalarNode('service')->end() ->scalarNode('name')->end() ->end() diff --git a/src/DependencyInjection/DoctrineExtension.php b/src/DependencyInjection/DoctrineExtension.php index 5f372cc42..785158f63 100644 --- a/src/DependencyInjection/DoctrineExtension.php +++ b/src/DependencyInjection/DoctrineExtension.php @@ -1191,7 +1191,7 @@ private function loadOrmSecondLevelCache(array $entityManager, Definition $ormCo $container ->setDefinition($regionId, new Definition(DefaultRegion::class)) - ->setArguments([$name, new Reference($driverId), $region['lifetime']]); + ->setArguments([$name, new Reference($driverId), $region['lifetime'] ?? $entityManager['second_level_cache']['region_lifetime']]); } if ($regionType === 'filelock') { @@ -1205,7 +1205,10 @@ private function loadOrmSecondLevelCache(array $entityManager, Definition $ormCo $regionsDef->addMethodCall('getLockLifetime', [$name, $region['lock_lifetime']]); } - $regionsDef->addMethodCall('setLifetime', [$name, $region['lifetime']]); + if ($region['lifetime'] !== null) { + $regionsDef->addMethodCall('setLifetime', [$name, $region['lifetime']]); + } + $slcFactoryDef->addMethodCall('setRegion', [$regionRef]); } } From 67d0146c4a7f4dae82da260384c481a65fcc3daf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Apr 2026 15:22:33 +0000 Subject: [PATCH 12/16] Bump the doctrine group with 6 updates Bumps the doctrine group with 6 updates: | Package | From | To | | --- | --- | --- | | [doctrine/.github/.github/workflows/coding-standards.yml](https://github.com/doctrine/.github) | `14.0.0` | `15.0.0` | | [doctrine/.github/.github/workflows/composer-lint.yml](https://github.com/doctrine/.github) | `14.0.0` | `15.0.0` | | [doctrine/.github/.github/workflows/documentation.yml](https://github.com/doctrine/.github) | `14.0.0` | `15.0.0` | | [doctrine/.github/.github/workflows/release-on-milestone-closed.yml](https://github.com/doctrine/.github) | `14.0.0` | `15.0.0` | | [doctrine/.github/.github/workflows/phpstan.yml](https://github.com/doctrine/.github) | `14.0.0` | `15.0.0` | | [doctrine/.github/.github/workflows/website-schema.yml](https://github.com/doctrine/.github) | `14.0.0` | `15.0.0` | Updates `doctrine/.github/.github/workflows/coding-standards.yml` from 14.0.0 to 15.0.0 - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/14.0.0...15.0.0) Updates `doctrine/.github/.github/workflows/composer-lint.yml` from 14.0.0 to 15.0.0 - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/14.0.0...15.0.0) Updates `doctrine/.github/.github/workflows/documentation.yml` from 14.0.0 to 15.0.0 - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/14.0.0...15.0.0) Updates `doctrine/.github/.github/workflows/release-on-milestone-closed.yml` from 14.0.0 to 15.0.0 - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/14.0.0...15.0.0) Updates `doctrine/.github/.github/workflows/phpstan.yml` from 14.0.0 to 15.0.0 - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/14.0.0...15.0.0) Updates `doctrine/.github/.github/workflows/website-schema.yml` from 14.0.0 to 15.0.0 - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/14.0.0...15.0.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/coding-standards.yml dependency-version: 15.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: doctrine - dependency-name: doctrine/.github/.github/workflows/composer-lint.yml dependency-version: 15.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: doctrine - dependency-name: doctrine/.github/.github/workflows/documentation.yml dependency-version: 15.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: doctrine - dependency-name: doctrine/.github/.github/workflows/release-on-milestone-closed.yml dependency-version: 15.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: doctrine - dependency-name: doctrine/.github/.github/workflows/phpstan.yml dependency-version: 15.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: doctrine - dependency-name: doctrine/.github/.github/workflows/website-schema.yml dependency-version: 15.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: doctrine ... Signed-off-by: dependabot[bot] --- .github/workflows/coding-standards.yml | 2 +- .github/workflows/composer-lint.yml | 2 +- .github/workflows/documentation.yml | 2 +- .github/workflows/release-on-milestone-closed.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- .github/workflows/website-schema.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 617826f1d..5ca77c62e 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@14.0.0" + uses: "doctrine/.github/.github/workflows/coding-standards.yml@15.0.0" with: composer-options: "--prefer-dist --prefer-stable" diff --git a/.github/workflows/composer-lint.yml b/.github/workflows/composer-lint.yml index 89b67fe4f..d585f2e0f 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@14.0.0" + uses: "doctrine/.github/.github/workflows/composer-lint.yml@15.0.0" diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 3282d790e..1e29b64ac 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@14.0.0" \ No newline at end of file + uses: "doctrine/.github/.github/workflows/documentation.yml@15.0.0" \ No newline at end of file diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml index c714aa256..7100986c4 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@14.0.0" + uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@15.0.0" secrets: GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }} GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }} diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index e8a7e414f..e53427aec 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@14.0.0" + uses: "doctrine/.github/.github/workflows/phpstan.yml@15.0.0" diff --git a/.github/workflows/website-schema.yml b/.github/workflows/website-schema.yml index ccefb1351..c73d07110 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@14.0.0" + uses: "doctrine/.github/.github/workflows/website-schema.yml@15.0.0" From 79dd8306c238dbcfde3f346564aaba20c88fafed Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Fri, 24 Apr 2026 19:51:35 +0200 Subject: [PATCH 13/16] use complete version numbers in PHP requirements --- tests/RegistryTest.php | 4 ++-- tests/Repository/ServiceEntityRepositoryTest.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/RegistryTest.php b/tests/RegistryTest.php index 728419419..fd491d9cb 100644 --- a/tests/RegistryTest.php +++ b/tests/RegistryTest.php @@ -124,7 +124,7 @@ public function testResetUnknownEntityManager(): void } #[IgnoreDeprecations] - #[RequiresPhp('<8.4')] + #[RequiresPhp('<8.4.0')] public function testReset(): void { if (! interface_exists(EntityManagerInterface::class)) { @@ -154,7 +154,7 @@ public function testReset(): void $registry->reset(); } - #[RequiresPhp('>= 8.4')] + #[RequiresPhp('>= 8.4.0')] public function testResetLazyObject(): void { if (! interface_exists(EntityManagerInterface::class) || ! interface_exists(LazyObjectInterface::class)) { diff --git a/tests/Repository/ServiceEntityRepositoryTest.php b/tests/Repository/ServiceEntityRepositoryTest.php index 43ca68d4f..bd2fa9ee2 100644 --- a/tests/Repository/ServiceEntityRepositoryTest.php +++ b/tests/Repository/ServiceEntityRepositoryTest.php @@ -43,7 +43,7 @@ public function testConstructorThrowsExceptionWhenNoManagerFound(): void #[IgnoreDeprecations] #[RequiresMethod(ProxyHelper::class, 'generateLazyGhost')] - #[RequiresPhp('>= 8.4')] + #[RequiresPhp('>= 8.4.0')] public function testConstructInitializesWhenImplementingLazyObjectInterface(): void { $registry = $this->createStub(ManagerRegistry::class); From d54c73eec0a03a95f34f73899fec792e210f60c7 Mon Sep 17 00:00:00 2001 From: Tac Tacelosky Date: Mon, 18 May 2026 07:54:07 -0400 Subject: [PATCH 14/16] Remove empty registerCommands override --- src/DoctrineBundle.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/DoctrineBundle.php b/src/DoctrineBundle.php index 02d6856cd..42dd2a4da 100644 --- a/src/DoctrineBundle.php +++ b/src/DoctrineBundle.php @@ -20,7 +20,6 @@ use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterUidTypePass; use Symfony\Bridge\Doctrine\DependencyInjection\Security\UserProvider\EntityFactory; use Symfony\Bundle\SecurityBundle\DependencyInjection\SecurityExtension; -use Symfony\Component\Console\Application; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\Compiler\PassConfig; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -111,10 +110,6 @@ public function shutdown(): void } } - public function registerCommands(Application $application): void - { - } - public function getPath(): string { return dirname(__DIR__); From 23588dec3b1e551a452df4a15b47d5b564d9f72e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 18 May 2026 15:22:34 +0000 Subject: [PATCH 15/16] Fix coding standard: use aliased class name in RequiresMethod attribute Agent-Logs-Url: https://github.com/doctrine/DoctrineBundle/sessions/d0e2d99e-aa55-4fad-8394-21497081c515 Co-authored-by: greg0ire <657779+greg0ire@users.noreply.github.com> --- tests/Middleware/IdleConnectionMiddlewareTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Middleware/IdleConnectionMiddlewareTest.php b/tests/Middleware/IdleConnectionMiddlewareTest.php index eab572ff2..a40d4b1ab 100644 --- a/tests/Middleware/IdleConnectionMiddlewareTest.php +++ b/tests/Middleware/IdleConnectionMiddlewareTest.php @@ -15,7 +15,7 @@ class IdleConnectionMiddlewareTest extends TestCase { - #[RequiresMethod(\Symfony\Bridge\Doctrine\Middleware\IdleConnection\Driver::class, '__construct')] + #[RequiresMethod(IdleConnectionDriver::class, '__construct')] public function testWrap(): void { /** @var ArrayObject $connectionExpiries */ From 9670526ce9a8512c207da3ea4a8103127369f602 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 26 May 2026 21:29:54 +0200 Subject: [PATCH 16/16] Add SECURITY.md to link to reporting policy and email. --- SECURITY.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 000000000..ea50be4db --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,8 @@ +# Security + +If you find a Security bug in Doctrine, please follow our +[Security reporting guidelines](https://www.doctrine-project.org/policies/security.html#reporting). + +Security vulnerabilities should be reported to security@doctrine-project.org +and not posted on the GitHub issue tracker of the project. +