fix Doctrine deprecations (#1667)

DependencyInjection/DoctrineExtension.php

@@ -742,6 +742,7 @@ protected function loadOrmEntityManager(array $entityManager, ContainerBuilder $
             ->setArguments([
                 new Reference(sprintf('doctrine.dbal.%s_connection', $entityManager['connection'])),
                 new Reference(sprintf('doctrine.orm.%s_configuration', $entityManager['name'])),
+                new Reference(sprintf('doctrine.dbal.%s_connection.event_manager', $entityManager['connection'])),
             ])
             ->setConfigurator([new Reference($managerConfiguratorName), 'configure']);
 

Tests/Dbal/Logging/BacktraceLoggerTest.php

@@ -7,6 +7,7 @@
 
 use function current;
 
+/** @group legacy */
 class BacktraceLoggerTest extends TestCase
 {
     public function testBacktraceLogged(): void

Tests/DependencyInjection/AbstractDoctrineExtensionTest.php

@@ -296,6 +296,7 @@ public function testLoadSimpleSingleConnection(): void
         $this->assertDICConstructorArguments($definition, [
             new Reference('doctrine.dbal.default_connection'),
             new Reference('doctrine.orm.default_configuration'),
+            new Reference('doctrine.dbal.default_connection.event_manager'),
         ]);
     }
 
@@ -334,6 +335,7 @@ public function testLoadSimpleSingleConnectionWithoutDbName(): void
         $this->assertDICConstructorArguments($definition, [
             new Reference('doctrine.dbal.default_connection'),
             new Reference('doctrine.orm.default_configuration'),
+            new Reference('doctrine.dbal.default_connection.event_manager'),
         ]);
     }
 
@@ -370,6 +372,7 @@ public function testLoadSingleConnection(): void
         $this->assertDICConstructorArguments($definition, [
             new Reference('doctrine.dbal.default_connection'),
             new Reference('doctrine.orm.default_configuration'),
+            new Reference('doctrine.dbal.default_connection.event_manager'),
         ]);
 
         $configDef = $container->getDefinition('doctrine.orm.default_configuration');
@@ -1424,8 +1427,6 @@ private function assertDICDefinitionMethodCallAt(
         $calls = $definition->getMethodCalls();
         if (! isset($calls[$pos][0])) {
             $this->fail(sprintf('Method call at position %s not found!', $pos));
-
-            return;
         }
 
         $this->assertEquals($methodName, $calls[$pos][0], "Method '" . $methodName . "' is expected to be called at position " . $pos . '.');

Tests/DependencyInjection/DoctrineExtensionTest.php

@@ -597,6 +597,7 @@ public function testSingleEntityManagerWithDefaultConfiguration(): void
         $this->assertDICConstructorArguments($definition, [
             new Reference('doctrine.dbal.default_connection'),
             new Reference('doctrine.orm.default_configuration'),
+            new Reference('doctrine.dbal.default_connection.event_manager'),
         ]);
     }
 
@@ -645,6 +646,7 @@ public function testSingleEntityManagerWithDefaultSecondLevelCacheConfiguration(
         $this->assertDICConstructorArguments($definition, [
             new Reference('doctrine.dbal.default_connection'),
             new Reference('doctrine.orm.default_configuration'),
+            new Reference('doctrine.dbal.default_connection.event_manager'),
         ]);
 
         $slcDefinition = $container->getDefinition('doctrine.orm.default_second_level_cache.default_cache_factory');
@@ -680,6 +682,7 @@ public function testSingleEntityManagerWithCustomSecondLevelCacheConfiguration()
         $this->assertDICConstructorArguments($definition, [
             new Reference('doctrine.dbal.default_connection'),
             new Reference('doctrine.orm.default_configuration'),
+            new Reference('doctrine.dbal.default_connection.event_manager'),
         ]);
 
         $slcDefinition = $container->getDefinition('doctrine.orm.default_second_level_cache.default_cache_factory');

Tests/ProfilerTest.php

@@ -4,9 +4,10 @@
 
 use Doctrine\Bundle\DoctrineBundle\DataCollector\DoctrineDataCollector;
 use Doctrine\Bundle\DoctrineBundle\Twig\DoctrineExtension;
-use Doctrine\DBAL\Logging\DebugStack;
 use Doctrine\Persistence\ManagerRegistry;
 use PHPUnit\Framework\TestCase as BaseTestCase;
+use Symfony\Bridge\Doctrine\Middleware\Debug\DebugDataHolder;
+use Symfony\Bridge\Doctrine\Middleware\Debug\Query;
 use Symfony\Bridge\Twig\Extension\CodeExtension;
 use Symfony\Bridge\Twig\Extension\HttpKernelExtension;
 use Symfony\Bridge\Twig\Extension\HttpKernelRuntime;
@@ -28,21 +29,24 @@
 use function preg_quote;
 use function str_replace;
 
+/**
+ * @psalm-suppress InternalMethod
+ * @psalm-suppress InternalClass
+ */
 class ProfilerTest extends BaseTestCase
 {
-    private DebugStack $logger;
+    private DebugDataHolder $debugDataHolder;
     private Environment $twig;
     private DoctrineDataCollector $collector;
 
     public function setUp(): void
     {
-        $this->logger = new DebugStack();
-        $registry     = $this->getMockBuilder(ManagerRegistry::class)->getMock();
+        $this->debugDataHolder = new DebugDataHolder();
+        $registry              = $this->getMockBuilder(ManagerRegistry::class)->getMock();
         $registry->method('getConnectionNames')->willReturn([]);
         $registry->method('getManagerNames')->willReturn([]);
         $registry->method('getManagers')->willReturn([]);
-        $this->collector = new DoctrineDataCollector($registry);
-        $this->collector->addLogger('foo', $this->logger);
+        $this->collector = new DoctrineDataCollector($registry, true, $this->debugDataHolder);
 
         $twigLoaderFilesystem = new FilesystemLoader(__DIR__ . '/../Resources/views/Collector');
         $twigLoaderFilesystem->addPath(__DIR__ . '/../vendor/symfony/web-profiler-bundle/Resources/views', 'WebProfiler');
@@ -75,14 +79,7 @@ public function setUp(): void
 
     public function testRender(): void
     {
-        $this->logger->queries = [
-            [
-                'sql' => 'SELECT * FROM foo WHERE bar IN (?, ?) AND "" >= ""',
-                'params' => ['foo', 'bar'],
-                'types' => null,
-                'executionMS' => 1,
-            ],
-        ];
+        $this->debugDataHolder->addQuery('foo', new Query('SELECT * FROM foo WHERE bar IN (?, ?) AND "" >= ""'));
 
         $this->collector->collect($request = new Request(['group' => '0']), new Response());
 
@@ -103,7 +100,7 @@ public function testRender(): void
             'page' => 'foo',
             'profile' => $profile,
             'collector' => $this->collector,
-            'queries' => $this->logger->queries,
+            'queries' => $this->debugDataHolder->getData(),
         ]);
 
         $expectedEscapedSql = 'SELECT
  *
FROM
  foo
WHERE
  bar IN (?, ?)
  AND "" >= ""';