Fix merge

Author: nicolas-grekas

Tests/DoctrineTestHelper.php

@@ -59,7 +59,7 @@ public static function createTestEntityManager(Configuration $config = null): En
 
     public static function createTestConfiguration(): Configuration
     {
-        $config = class_exists(ORMSetup::class) ? ORMSetup::createConfiguration(true) : new Configuration();
+        $config = ORMSetup::createConfiguration(true);
         $config->setEntityNamespaces(['SymfonyTestsDoctrine' => 'Symfony\Bridge\Doctrine\Tests\Fixtures']);
         $config->setAutoGenerateProxyClasses(true);
         $config->setProxyDir(sys_get_temp_dir());
@@ -72,8 +72,7 @@ public static function createTestConfiguration(): Configuration
         if (class_exists(DefaultSchemaManagerFactory::class)) {
             $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
         }
-
-        if (method_exists(Configuration::class, 'setLazyGhostObjectEnabled')) {
+        if (method_exists($config, 'setLazyGhostObjectEnabled')) {
             $config->setLazyGhostObjectEnabled(true);
         }
 

Tests/Middleware/Debug/MiddlewareTest.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Bridge\Doctrine\Tests\Middleware\Debug;
 
-use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver\Middleware as MiddlewareInterface;
 use Doctrine\DBAL\DriverManager;
@@ -51,10 +50,13 @@ private function init(bool $withStopwatch = true): void
     {
         $this->stopwatch = $withStopwatch ? new Stopwatch() : null;
 
-        $config = class_exists(ORMSetup::class) ? ORMSetup::createConfiguration(true) : new Configuration();
+        $config = ORMSetup::createConfiguration(true);
         if (class_exists(DefaultSchemaManagerFactory::class)) {
             $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
         }
+        if (method_exists($config, 'setLazyGhostObjectEnabled')) {
+            $config->setLazyGhostObjectEnabled(true);
+        }
         $this->debugDataHolder = new DebugDataHolder();
         $config->setMiddlewares([new Middleware($this->debugDataHolder, $this->stopwatch)]);
 

Tests/PropertyInfo/DoctrineExtractorTest.php

@@ -43,6 +43,10 @@ private function createExtractor()
             $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
         }
 
+        if (method_exists($config, 'setLazyGhostObjectEnabled')) {
+            $config->setLazyGhostObjectEnabled(true);
+        }
+
         if (!(new \ReflectionMethod(EntityManager::class, '__construct'))->isPublic()) {
             $entityManager = EntityManager::create(['driver' => 'pdo_sqlite'], $config);
         } else {

Tests/Security/RememberMe/DoctrineTokenProviderTest.php

@@ -11,7 +11,6 @@
 
 namespace Security\RememberMe;
 
-use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
 use Doctrine\ORM\ORMSetup;
@@ -123,11 +122,15 @@ public function testVerifyOutdatedTokenAfterParallelRequestFailsAfter60Seconds()
      */
     private function bootstrapProvider()
     {
-        $config = class_exists(ORMSetup::class) ? ORMSetup::createConfiguration(true) : new Configuration();
+        $config = ORMSetup::createConfiguration(true);
         if (class_exists(DefaultSchemaManagerFactory::class)) {
             $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
         }
 
+        if (method_exists($config, 'setLazyGhostObjectEnabled')) {
+            $config->setLazyGhostObjectEnabled(true);
+        }
+
         $connection = DriverManager::getConnection([
             'driver' => 'pdo_sqlite',
             'memory' => true,