Merge release 3.2.3 into 3.3.x

.github/dependabot.yml

@@ -7,3 +7,7 @@ updates:
     labels:
       - "CI"
     target-branch: "2.18.x"
+    groups:
+      doctrine:
+        patterns:
+          - "doctrine/*"

.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@15.0.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@13.1.0"
+    uses: "doctrine/.github/.github/workflows/composer-lint.yml@15.0.0"

.github/workflows/continuous-integration.yml

@@ -121,7 +121,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"
@@ -130,7 +130,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"
@@ -150,12 +150,12 @@ jobs:
           fetch-depth: 2
 
       - name: "Download coverage files"
-        uses: "actions/download-artifact@v7"
+        uses: "actions/download-artifact@v8"
         with:
           path: "reports"
 
       - name: "Upload to Codecov"
-        uses: "codecov/codecov-action@v5"
+        uses: "codecov/codecov-action@v6"
         with:
           directory: reports
         env:

.github/workflows/documentation.yml

@@ -17,4 +17,4 @@ on:
 jobs:
   documentation:
     name: "Documentation"
-    uses: "doctrine/.github/.github/workflows/documentation.yml@13.1.0"
+    uses: "doctrine/.github/.github/workflows/documentation.yml@15.0.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@13.1.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 }}

.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"

.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@15.0.0"

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.
+

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()

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]);
             }
         }

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__);

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<string, int> $connectionExpiries */