Merge branch '6.4' into 7.1

* 6.4:
  Make more data providers static
  fix merge
  Mutate remaining data providers to static ones

Tests/Transport/ConnectionTest.php

@@ -720,7 +720,7 @@ public function testFindAllSqlGenerated(AbstractPlatform $platform, string $expe
         $connection->findAll(50);
     }
 
-    public function provideFindAllSqlGeneratedByPlatform(): iterable
+    public static function provideFindAllSqlGeneratedByPlatform(): iterable
     {
         yield 'MySQL' => [
             class_exists(MySQLPlatform::class) ? new MySQLPlatform() : new MySQL57Platform(),