Merge branch '6.4' into 7.0

* 6.4:
  Fix merge

Author: nicolas-grekas

Tests/DoctrineTestHelper.php

@@ -60,7 +60,7 @@ public static function createTestConfiguration(): Configuration
         $config->setMetadataDriverImpl(new AttributeDriver([__DIR__.'/../Tests/Fixtures' => 'Symfony\Bridge\Doctrine\Tests\Fixtures'], true));
         $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,8 +50,11 @@ 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);
         $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

@@ -39,6 +39,9 @@ private function createExtractor(): DoctrineExtractor
         $config = ORMSetup::createConfiguration(true);
         $config->setMetadataDriverImpl(new AttributeDriver([__DIR__.'/../Tests/Fixtures' => 'Symfony\Bridge\Doctrine\Tests\Fixtures'], true));
         $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
+        if (method_exists($config, 'setLazyGhostObjectEnabled')) {
+            $config->setLazyGhostObjectEnabled(true);
+        }
 
         $eventManager = new EventManager();
         $entityManager = new EntityManager(DriverManager::getConnection(['driver' => 'pdo_sqlite'], $config, $eventManager), $config, $eventManager);

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;
@@ -120,9 +119,13 @@ public function testVerifyOutdatedTokenAfterParallelRequestFailsAfter60Seconds()
 
     private function bootstrapProvider(): DoctrineTokenProvider
     {
-        $config = class_exists(ORMSetup::class) ? ORMSetup::createConfiguration(true) : new Configuration();
+        $config = ORMSetup::createConfiguration(true);
         $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
 
+        if (method_exists($config, 'setLazyGhostObjectEnabled')) {
+            $config->setLazyGhostObjectEnabled(true);
+        }
+
         $connection = DriverManager::getConnection([
             'driver' => 'pdo_sqlite',
             'memory' => true,