[DoctrineBridge] Fix compatibility to Doctrine persistence 2.5 in Doc…

…trine Bridge 6.4 to avoid Projects stuck on 6.3
symfony · fabpot · Jan 6, 2025 · Dec 11, 2024 · Jan 6, 2025 · df3cef89976dc1fadd53589b2c1a16f2ae04c4bc
commit df3cef89976dc1fadd53589b2c1a16f2ae04c4bc
diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
         "ext-xml": "*",
         "friendsofphp/proxy-manager-lts": "^1.0.2",
         "doctrine/event-manager": "^1.2|^2",
-        "doctrine/persistence": "^3.1",
+        "doctrine/persistence": "^2.5|^3.1",
         "twig/twig": "^2.13|^3.0.4",
         "psr/cache": "^2.0|^3.0",
         "psr/clock": "^1.0",

diff --git a/src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php b/src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php
@@ -61,7 +61,10 @@ public static function createTestConfiguration(): Configuration
         if (class_exists(DefaultSchemaManagerFactory::class)) {
             $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
         }
-        $config->setLazyGhostObjectEnabled(true);
+
+        if (!class_exists(\Doctrine\Persistence\Mapping\Driver\AnnotationDriver::class)) { // doctrine/persistence >= 3.0
+            $config->setLazyGhostObjectEnabled(true);
+        }
 
         return $config;
     }

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Middleware/Debug/MiddlewareTest.php b/src/Symfony/Bridge/Doctrine/Tests/Middleware/Debug/MiddlewareTest.php
@@ -55,7 +55,9 @@ private function init(bool $withStopwatch = true): void
         if (class_exists(DefaultSchemaManagerFactory::class)) {
             $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
         }
-        $config->setLazyGhostObjectEnabled(true);
+        if (!class_exists(\Doctrine\Persistence\Mapping\Driver\AnnotationDriver::class)) { // doctrine/persistence >= 3.0
+            $config->setLazyGhostObjectEnabled(true);
+        }
         $this->debugDataHolder = new DebugDataHolder();
         $config->setMiddlewares([new Middleware($this->debugDataHolder, $this->stopwatch)]);
 

diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -44,7 +44,9 @@ private function createExtractor(): DoctrineExtractor
         if (class_exists(DefaultSchemaManagerFactory::class)) {
             $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
         }
-        $config->setLazyGhostObjectEnabled(true);
+        if (!class_exists(\Doctrine\Persistence\Mapping\Driver\AnnotationDriver::class)) { // doctrine/persistence >= 3.0
+            $config->setLazyGhostObjectEnabled(true);
+        }
 
         $eventManager = new EventManager();
         $entityManager = new EntityManager(DriverManager::getConnection(['driver' => 'pdo_sqlite'], $config, $eventManager), $config, $eventManager);

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Security/RememberMe/DoctrineTokenProviderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Security/RememberMe/DoctrineTokenProviderTest.php
@@ -124,7 +124,9 @@ protected function bootstrapProvider(): DoctrineTokenProvider
             $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
         }
 
-        $config->setLazyGhostObjectEnabled(true);
+        if (!class_exists(\Doctrine\Persistence\Mapping\Driver\AnnotationDriver::class)) { // doctrine/persistence >= 3.0
+            $config->setLazyGhostObjectEnabled(true);
+        }
 
         $connection = DriverManager::getConnection([
             'driver' => 'pdo_sqlite',

diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.1",
         "doctrine/event-manager": "^1.2|^2",
-        "doctrine/persistence": "^3.1",
+        "doctrine/persistence": "^2.5|^3.1",
         "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0",