Merge branch '3.10.x' into 4.3.x

* 3.10.x:
  Fix argument count of data providers (#7076)

Author: derrabus

tests/Platforms/PostgreSQLPlatformTest.php

@@ -18,6 +18,7 @@
 use Doctrine\DBAL\TransactionIsolationLevel;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Types\Types;
+use Generator;
 use PHPUnit\Framework\Attributes\DataProvider;
 use UnexpectedValueException;
 
@@ -404,14 +405,22 @@ protected function getQuotedColumnInForeignKeySQL(): array
         ];
     }
 
-    #[DataProvider('pgBooleanProvider')]
+    #[DataProvider('provideConvertBooleansAsLiteralStrings')]
     public function testConvertBooleanAsLiteralStrings(
         string $databaseValue,
         string $preparedStatementValue,
     ): void {
         self::assertEquals($preparedStatementValue, $this->platform->convertBooleans($databaseValue));
     }
 
+    /** @return Generator<int, array{string, string}> */
+    public static function provideConvertBooleansAsLiteralStrings(): Generator
+    {
+        foreach (self::pgBooleanProvider() as $key => $params) {
+            yield $key => [$params[0], $params[1]];
+        }
+    }
+
     public function testConvertBooleanAsLiteralIntegers(): void
     {
         $this->platform->setUseBooleanTrueFalseStrings(false);
@@ -423,16 +432,22 @@ public function testConvertBooleanAsLiteralIntegers(): void
         self::assertEquals(0, $this->platform->convertBooleans('0'));
     }
 
-    #[DataProvider('pgBooleanProvider')]
+    #[DataProvider('provideConvertBooleanAsDatabaseValueStrings')]
     public function testConvertBooleanAsDatabaseValueStrings(
-        string $databaseValue,
-        string $preparedStatementValue,
         int $integerValue,
         bool $booleanValue,
     ): void {
         self::assertSame($integerValue, $this->platform->convertBooleansToDatabaseValue($booleanValue));
     }
 
+    /** @return Generator<int, array{int, bool}> */
+    public static function provideConvertBooleanAsDatabaseValueStrings(): Generator
+    {
+        foreach (self::pgBooleanProvider() as $key => $params) {
+            yield $key => [$params[2], $params[3]];
+        }
+    }
+
     public function testConvertBooleanAsDatabaseValueIntegers(): void
     {
         $this->platform->setUseBooleanTrueFalseStrings(false);
@@ -441,16 +456,22 @@ public function testConvertBooleanAsDatabaseValueIntegers(): void
         self::assertSame(0, $this->platform->convertBooleansToDatabaseValue(false));
     }
 
-    #[DataProvider('pgBooleanProvider')]
+    #[DataProvider('provideConvertFromBoolean')]
     public function testConvertFromBoolean(
         string $databaseValue,
-        string $prepareStatementValue,
-        int $integerValue,
         bool $booleanValue,
     ): void {
         self::assertSame($booleanValue, $this->platform->convertFromBoolean($databaseValue));
     }
 
+    /** @return Generator<int, array{string, bool}> */
+    public static function provideConvertFromBoolean(): Generator
+    {
+        foreach (self::pgBooleanProvider() as $key => $params) {
+            yield $key => [$params[0], $params[3]];
+        }
+    }
+
     public function testThrowsExceptionWithInvalidBooleanLiteral(): void
     {
         $this->expectException(UnexpectedValueException::class);
@@ -719,7 +740,7 @@ protected function getQuotedAlterTableRenameIndexSQL(): array
     /**
      * PostgreSQL boolean strings provider
      *
-     * @return mixed[][]
+     * @return list<array{string, string, int, bool}>
      */
     public static function pgBooleanProvider(): iterable
     {