Merge branch '6.2' into 6.3

* 6.2:
  fix merge

Author: nicolas-grekas

Tests/Middleware/Debug/MiddlewareTest.php

@@ -16,6 +16,7 @@
 use Doctrine\DBAL\Driver\Middleware as MiddlewareInterface;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\ParameterType;
+use Doctrine\DBAL\Result;
 use Doctrine\DBAL\Statement;
 use Doctrine\DBAL\Types\Types;
 use PHPUnit\Framework\TestCase;