Merge branch '6.4' into 7.1

xabbuh · xabbuh · commit 1ffa1c7287d9 · 2024-08-30T09:19:54.000+02:00
* 6.4:
  fix test to be compatible with DBAL 4.2
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/PostgreSqlConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/PostgreSqlConnectionTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Messenger\Bridge\Doctrine\Tests\Transport;
 
-use Doctrine\DBAL\Cache\ArrayResult;
+use Doctrine\DBAL\Driver\Result as DriverResult;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Query\QueryBuilder;
 use Doctrine\DBAL\Result;
@@ -84,10 +84,13 @@ public function countNotifyCalls()
             ->method('getNativeConnection')
             ->willReturn($wrappedConnection);
 
+        $driverResult = $this->createMock(DriverResult::class);
+        $driverResult->method('fetchAssociative')
+            ->willReturn(false);
         $driverConnection
             ->expects(self::any())
             ->method('executeQuery')
-            ->willReturn(new Result(new ArrayResult([]), $driverConnection));
+            ->willReturn(new Result($driverResult, $driverConnection));
 
         $connection = new PostgreSqlConnection(['table_name' => 'queue_table'], $driverConnection);
 
