Merge branch '6.4' into 7.0

* 6.4:
  fix tests with Doctrine DBAL 3.8
  CS fix

Author: xabbuh

Tests/Middleware/Debug/MiddlewareTest.php

@@ -15,6 +15,7 @@
 use Doctrine\DBAL\Driver\Middleware as MiddlewareInterface;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\ParameterType;
+use Doctrine\DBAL\Query\QueryBuilder;
 use Doctrine\DBAL\Result;
 use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
 use Doctrine\DBAL\Statement;
@@ -204,11 +205,11 @@ public function testTransaction(callable $endTransactionMethod, string $expected
         $this->assertCount(9, $debug);
         $this->assertSame('"START TRANSACTION"', $debug[1]['sql']);
         $this->assertGreaterThan(0, $debug[1]['executionMS']);
-        $this->assertSame('SAVEPOINT DOCTRINE2_SAVEPOINT_2', $debug[2]['sql']);
+        $this->assertSame(method_exists(QueryBuilder::class, 'resetOrderBy') ? 'SAVEPOINT DOCTRINE_2' : 'SAVEPOINT DOCTRINE2_SAVEPOINT_2', $debug[2]['sql']);
         $this->assertGreaterThan(0, $debug[2]['executionMS']);
         $this->assertSame('INSERT INTO products(name, price, stock) VALUES ("product1", 12.5, 5)', $debug[3]['sql']);
         $this->assertGreaterThan(0, $debug[3]['executionMS']);
-        $this->assertSame(('"ROLLBACK"' === $expectedEndTransactionDebug ? 'ROLLBACK TO' : 'RELEASE').' SAVEPOINT DOCTRINE2_SAVEPOINT_2', $debug[4]['sql']);
+        $this->assertSame(('"ROLLBACK"' === $expectedEndTransactionDebug ? 'ROLLBACK TO' : 'RELEASE').' '.(method_exists(QueryBuilder::class, 'resetOrderBy') ? 'SAVEPOINT DOCTRINE_2' : 'SAVEPOINT DOCTRINE2_SAVEPOINT_2'), $debug[4]['sql']);
         $this->assertGreaterThan(0, $debug[4]['executionMS']);
         $this->assertSame($expectedEndTransactionDebug, $debug[5]['sql']);
         $this->assertGreaterThan(0, $debug[5]['executionMS']);