Merge branch '6.3' into 6.4

nicolas-grekas · nicolas-grekas · commit e1bdcf0a38e9 · 2023-10-13T12:26:44.000+02:00
* 6.3:
  Fix DBAL 4 compatibility
  [Cache] Fix ArrayAdapter::freeze() return type
  Do not match request twice in HttpUtils
diff --git a/Form/DoctrineOrmTypeGuesser.php b/Form/DoctrineOrmTypeGuesser.php
@@ -61,7 +61,7 @@ public function guessType(string $class, string $property): ?TypeGuess
         }
 
         return match ($metadata->getTypeOfField($property)) {
-            'array',
+            'array', // DBAL < 4
             Types::SIMPLE_ARRAY => new TypeGuess(CollectionType::class, [], Guess::MEDIUM_CONFIDENCE),
             Types::BOOLEAN => new TypeGuess(CheckboxType::class, [], Guess::HIGH_CONFIDENCE),
             Types::DATETIME_MUTABLE,
diff --git a/Middleware/Debug/DBAL3/Statement.php b/Middleware/Debug/DBAL3/Statement.php
@@ -35,9 +35,9 @@ public function __construct(
         string $sql,
         private ?Stopwatch $stopwatch = null,
     ) {
-        parent::__construct($statement);
-
         $this->query = new Query($sql);
+
+        parent::__construct($statement);
     }
 
     public function bindParam($param, &$variable, $type = ParameterType::STRING, $length = null): bool
diff --git a/Middleware/Debug/Driver.php b/Middleware/Debug/Driver.php
@@ -41,15 +41,15 @@ public function connect(array $params): ConnectionInterface
                 $connection,
                 $this->debugDataHolder,
                 $this->stopwatch,
-                $this->connectionName,
+                $this->connectionName
             );
         }
 
         return new Connection(
             $connection,
             $this->debugDataHolder,
             $this->stopwatch,
-            $this->connectionName,
+            $this->connectionName
         );
     }
 }
diff --git a/Middleware/Debug/Query.php b/Middleware/Debug/Query.php
@@ -45,7 +45,7 @@ public function stop(): void
         }
     }
 
-    public function setParam(string|int $param, mixed &$variable, int $type): void
+    public function setParam(string|int $param, mixed &$variable, ParameterType|int $type): void
     {
         // Numeric indexes start at 0 in profiler
         $idx = \is_int($param) ? $param - 1 : $param;
@@ -87,7 +87,7 @@ public function getParams(): array
     }
 
     /**
-     * @return array<ParameterType|int>
+     * @return array<int, int|ParameterType>
      */
     public function getTypes(): array
     {
diff --git a/PropertyInfo/DoctrineExtractor.php b/PropertyInfo/DoctrineExtractor.php
@@ -159,8 +159,8 @@ public function getTypes(string $class, string $property, array $context = []):
                     break;
                 case Type::BUILTIN_TYPE_ARRAY:
                     switch ($typeOfField) {
-                        case 'array':
-                        case 'json_array':
+                        case 'array':      // DBAL < 4
+                        case 'json_array': // DBAL < 3
                             // return null if $enumType is set, because we can't determine if collectionKeyType is string or int
                             if ($enumType) {
                                 return null;
@@ -257,7 +257,7 @@ private function getPhpType(string $doctrineType): ?string
             Types::BOOLEAN => Type::BUILTIN_TYPE_BOOL,
             Types::BLOB,
             Types::BINARY => Type::BUILTIN_TYPE_RESOURCE,
-            'object',
+            'object', // DBAL < 4
             Types::DATE_MUTABLE,
             Types::DATETIME_MUTABLE,
             Types::DATETIMETZ_MUTABLE,
@@ -268,9 +268,9 @@ private function getPhpType(string $doctrineType): ?string
             Types::DATETIMETZ_IMMUTABLE,
             Types::TIME_IMMUTABLE,
             Types::DATEINTERVAL => Type::BUILTIN_TYPE_OBJECT,
-            'array',
-            Types::SIMPLE_ARRAY,
-            'json_array' => Type::BUILTIN_TYPE_ARRAY,
+            'array', // DBAL < 4
+            'json_array', // DBAL < 3
+            Types::SIMPLE_ARRAY => Type::BUILTIN_TYPE_ARRAY,
             default => null,
         };
     }
diff --git a/Tests/DataCollector/DoctrineDataCollectorWithDebugStackTest.php b/Tests/DataCollector/DoctrineDataCollectorWithDebugStackTest.php
@@ -37,7 +37,7 @@ class DoctrineDataCollectorWithDebugStackTest extends TestCase
     public static function setUpBeforeClass(): void
     {
         if (!class_exists(DebugStack::class)) {
-            self::markTestSkipped('This test requires DBAL < 4');
+            self::markTestSkipped('This test requires DBAL < 4.');
         }
     }
 
diff --git a/Tests/Fixtures/Type/StringWrapperType.php b/Tests/Fixtures/Type/StringWrapperType.php
@@ -16,12 +16,12 @@
 
 class StringWrapperType extends StringType
 {
-    public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed
+    public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
     {
         return $value instanceof StringWrapper ? $value->getString() : null;
     }
 
-    public function convertToPHPValue($value, AbstractPlatform $platform): mixed
+    public function convertToPHPValue($value, AbstractPlatform $platform): StringWrapper
     {
         return new StringWrapper($value);
     }
diff --git a/Tests/Logger/DbalLoggerTest.php b/Tests/Logger/DbalLoggerTest.php
@@ -24,7 +24,7 @@ class DbalLoggerTest extends TestCase
     public static function setUpBeforeClass(): void
     {
         if (!class_exists(SQLLogger::class)) {
-            self::markTestSkipped('This test requires DBAL < 4');
+            self::markTestSkipped('This test requires DBAL < 4.');
         }
     }
 
diff --git a/Tests/PropertyInfo/Fixtures/DoctrineFooType.php b/Tests/PropertyInfo/Fixtures/DoctrineFooType.php
@@ -32,7 +32,7 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla
         return $platform->getClobTypeDeclarationSQL([]);
     }
 
-    public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed
+    public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
     {
         if (null === $value) {
             return null;
@@ -44,7 +44,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): mixe
         return $foo->bar;
     }
 
-    public function convertToPHPValue($value, AbstractPlatform $platform): mixed
+    public function convertToPHPValue($value, AbstractPlatform $platform): ?Foo
     {
         if (null === $value) {
             return null;
diff --git a/Tests/Types/UlidTypeTest.php b/Tests/Types/UlidTypeTest.php
@@ -28,6 +28,9 @@ class_exists('Doctrine\DBAL\Platforms\PostgreSqlPlatform');
 // DBAL 3 compatibility
 class_exists('Doctrine\DBAL\Platforms\SqlitePlatform');
 
+// DBAL 3 compatibility
+class_exists('Doctrine\DBAL\Platforms\SqlitePlatform');
+
 final class UlidTypeTest extends TestCase
 {
     private const DUMMY_ULID = '01EEDQEK6ZAZE93J8KG5B4MBJC';
@@ -86,25 +89,25 @@ public function testNotSupportedTypeConversionForDatabaseValue()
     {
         $this->expectException(ConversionException::class);
 
-        $this->type->convertToDatabaseValue(new \stdClass(), new SqlitePlatform());
+        $this->type->convertToDatabaseValue(new \stdClass(), new SQLitePlatform());
     }
 
     public function testNullConversionForDatabaseValue()
     {
-        $this->assertNull($this->type->convertToDatabaseValue(null, new SqlitePlatform()));
+        $this->assertNull($this->type->convertToDatabaseValue(null, new SQLitePlatform()));
     }
 
     public function testUlidInterfaceConvertsToPHPValue()
     {
         $ulid = $this->createMock(AbstractUid::class);
-        $actual = $this->type->convertToPHPValue($ulid, new SqlitePlatform());
+        $actual = $this->type->convertToPHPValue($ulid, new SQLitePlatform());
 
         $this->assertSame($ulid, $actual);
     }
 
     public function testUlidConvertsToPHPValue()
     {
-        $ulid = $this->type->convertToPHPValue(self::DUMMY_ULID, new SqlitePlatform());
+        $ulid = $this->type->convertToPHPValue(self::DUMMY_ULID, new SQLitePlatform());
 
         $this->assertInstanceOf(Ulid::class, $ulid);
         $this->assertEquals(self::DUMMY_ULID, $ulid->__toString());
@@ -114,19 +117,19 @@ public function testInvalidUlidConversionForPHPValue()
     {
         $this->expectException(ConversionException::class);
 
-        $this->type->convertToPHPValue('abcdefg', new SqlitePlatform());
+        $this->type->convertToPHPValue('abcdefg', new SQLitePlatform());
     }
 
     public function testNullConversionForPHPValue()
     {
-        $this->assertNull($this->type->convertToPHPValue(null, new SqlitePlatform()));
+        $this->assertNull($this->type->convertToPHPValue(null, new SQLitePlatform()));
     }
 
     public function testReturnValueIfUlidForPHPValue()
     {
         $ulid = new Ulid();
 
-        $this->assertSame($ulid, $this->type->convertToPHPValue($ulid, new SqlitePlatform()));
+        $this->assertSame($ulid, $this->type->convertToPHPValue($ulid, new SQLitePlatform()));
     }
 
     public function testGetName()
@@ -155,6 +158,6 @@ public static function provideSqlDeclarations(): \Generator
 
     public function testRequiresSQLCommentHint()
     {
-        $this->assertTrue($this->type->requiresSQLCommentHint(new SqlitePlatform()));
+        $this->assertTrue($this->type->requiresSQLCommentHint(new SQLitePlatform()));
     }
 }
diff --git a/Types/AbstractUidType.php b/Types/AbstractUidType.php
@@ -110,9 +110,9 @@ private function throwInvalidType(mixed $value): never
     private function throwValueNotConvertible(mixed $value, \Throwable $previous): never
     {
         if (!class_exists(ValueNotConvertible::class)) {
-            throw ConversionException::conversionFailed($value, $this->getName(), previous: $previous);
+            throw ConversionException::conversionFailed($value, $this->getName(), $previous);
         }
 
-        throw ValueNotConvertible::new($value, $this->getName(), previous: $previous);
+        throw ValueNotConvertible::new($value, $this->getName(), null, $previous);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function guessType(string $class, string $property): ?TypeGuess`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`return match ($metadata->getTypeOfField($property)) {`
`64`		`- 'array',`
	`64`	`+ 'array', // DBAL < 4`
`65`	`65`	`Types::SIMPLE_ARRAY => new TypeGuess(CollectionType::class, [], Guess::MEDIUM_CONFIDENCE),`
`66`	`66`	`Types::BOOLEAN => new TypeGuess(CheckboxType::class, [], Guess::HIGH_CONFIDENCE),`
`67`	`67`	`Types::DATETIME_MUTABLE,`
Original file line number	Diff line number	Diff line change
`@@ -41,15 +41,15 @@ public function connect(array $params): ConnectionInterface`
`41`	`41`	`$connection,`
`42`	`42`	`$this->debugDataHolder,`
`43`	`43`	`$this->stopwatch,`
`44`		`- $this->connectionName,`
	`44`	`+ $this->connectionName`
`45`	`45`	`);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`return new Connection(`
`49`	`49`	`$connection,`
`50`	`50`	`$this->debugDataHolder,`
`51`	`51`	`$this->stopwatch,`
`52`		`- $this->connectionName,`
	`52`	`+ $this->connectionName`
`53`	`53`	`);`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function stop(): void`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`- public function setParam(string\|int $param, mixed &$variable, int $type): void`
	`48`	`+ public function setParam(string\|int $param, mixed &$variable, ParameterType\|int $type): void`
`49`	`49`	`{`
`50`	`50`	`// Numeric indexes start at 0 in profiler`
`51`	`51`	`$idx = \is_int($param) ? $param - 1 : $param;`
`@@ -87,7 +87,7 @@ public function getParams(): array`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`/**`
`90`		`- * @return array<ParameterType\|int>`
	`90`	`+ * @return array<int, int\|ParameterType>`
`91`	`91`	`*/`
`92`	`92`	`public function getTypes(): array`
`93`	`93`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class DoctrineDataCollectorWithDebugStackTest extends TestCase`
`37`	`37`	`public static function setUpBeforeClass(): void`
`38`	`38`	`{`
`39`	`39`	`if (!class_exists(DebugStack::class)) {`
`40`		`- self::markTestSkipped('This test requires DBAL < 4');`
	`40`	`+ self::markTestSkipped('This test requires DBAL < 4.');`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,12 @@`
`16`	`16`
`17`	`17`	`class StringWrapperType extends StringType`
`18`	`18`	`{`
`19`		`- public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed`
	`19`	`+ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string`
`20`	`20`	`{`
`21`	`21`	`return $value instanceof StringWrapper ? $value->getString() : null;`
`22`	`22`	`}`
`23`	`23`
`24`		`- public function convertToPHPValue($value, AbstractPlatform $platform): mixed`
	`24`	`+ public function convertToPHPValue($value, AbstractPlatform $platform): StringWrapper`
`25`	`25`	`{`
`26`	`26`	`return new StringWrapper($value);`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class DbalLoggerTest extends TestCase`
`24`	`24`	`public static function setUpBeforeClass(): void`
`25`	`25`	`{`
`26`	`26`	`if (!class_exists(SQLLogger::class)) {`
`27`		`- self::markTestSkipped('This test requires DBAL < 4');`
	`27`	`+ self::markTestSkipped('This test requires DBAL < 4.');`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla`
`32`	`32`	`return $platform->getClobTypeDeclarationSQL([]);`
`33`	`33`	`}`
`34`	`34`
`35`		`- public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed`
	`35`	`+ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string`
`36`	`36`	`{`
`37`	`37`	`if (null === $value) {`
`38`	`38`	`return null;`
`@@ -44,7 +44,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): mixe`
`44`	`44`	`return $foo->bar;`
`45`	`45`	`}`
`46`	`46`
`47`		`- public function convertToPHPValue($value, AbstractPlatform $platform): mixed`
	`47`	`+ public function convertToPHPValue($value, AbstractPlatform $platform): ?Foo`
`48`	`48`	`{`
`49`	`49`	`if (null === $value) {`
`50`	`50`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,9 @@ class_exists('Doctrine\DBAL\Platforms\PostgreSqlPlatform');`
`28`	`28`	`// DBAL 3 compatibility`
`29`	`29`	`class_exists('Doctrine\DBAL\Platforms\SqlitePlatform');`
`30`	`30`
	`31`	`+// DBAL 3 compatibility`
	`32`	`+class_exists('Doctrine\DBAL\Platforms\SqlitePlatform');`
	`33`	`+`
`31`	`34`	`final class UlidTypeTest extends TestCase`
`32`	`35`	`{`
`33`	`36`	`private const DUMMY_ULID = '01EEDQEK6ZAZE93J8KG5B4MBJC';`
`@@ -86,25 +89,25 @@ public function testNotSupportedTypeConversionForDatabaseValue()`
`86`	`89`	`{`
`87`	`90`	`$this->expectException(ConversionException::class);`
`88`	`91`
`89`		`- $this->type->convertToDatabaseValue(new \stdClass(), new SqlitePlatform());`
	`92`	`+ $this->type->convertToDatabaseValue(new \stdClass(), new SQLitePlatform());`
`90`	`93`	`}`
`91`	`94`
`92`	`95`	`public function testNullConversionForDatabaseValue()`
`93`	`96`	`{`
`94`		`- $this->assertNull($this->type->convertToDatabaseValue(null, new SqlitePlatform()));`
	`97`	`+ $this->assertNull($this->type->convertToDatabaseValue(null, new SQLitePlatform()));`
`95`	`98`	`}`
`96`	`99`
`97`	`100`	`public function testUlidInterfaceConvertsToPHPValue()`
`98`	`101`	`{`
`99`	`102`	`$ulid = $this->createMock(AbstractUid::class);`
`100`		`- $actual = $this->type->convertToPHPValue($ulid, new SqlitePlatform());`
	`103`	`+ $actual = $this->type->convertToPHPValue($ulid, new SQLitePlatform());`
`101`	`104`
`102`	`105`	`$this->assertSame($ulid, $actual);`
`103`	`106`	`}`
`104`	`107`
`105`	`108`	`public function testUlidConvertsToPHPValue()`
`106`	`109`	`{`
`107`		`- $ulid = $this->type->convertToPHPValue(self::DUMMY_ULID, new SqlitePlatform());`
	`110`	`+ $ulid = $this->type->convertToPHPValue(self::DUMMY_ULID, new SQLitePlatform());`
`108`	`111`
`109`	`112`	`$this->assertInstanceOf(Ulid::class, $ulid);`
`110`	`113`	`$this->assertEquals(self::DUMMY_ULID, $ulid->__toString());`
`@@ -114,19 +117,19 @@ public function testInvalidUlidConversionForPHPValue()`
`114`	`117`	`{`
`115`	`118`	`$this->expectException(ConversionException::class);`
`116`	`119`
`117`		`- $this->type->convertToPHPValue('abcdefg', new SqlitePlatform());`
	`120`	`+ $this->type->convertToPHPValue('abcdefg', new SQLitePlatform());`
`118`	`121`	`}`
`119`	`122`
`120`	`123`	`public function testNullConversionForPHPValue()`
`121`	`124`	`{`
`122`		`- $this->assertNull($this->type->convertToPHPValue(null, new SqlitePlatform()));`
	`125`	`+ $this->assertNull($this->type->convertToPHPValue(null, new SQLitePlatform()));`
`123`	`126`	`}`
`124`	`127`
`125`	`128`	`public function testReturnValueIfUlidForPHPValue()`
`126`	`129`	`{`
`127`	`130`	`$ulid = new Ulid();`
`128`	`131`
`129`		`- $this->assertSame($ulid, $this->type->convertToPHPValue($ulid, new SqlitePlatform()));`
	`132`	`+ $this->assertSame($ulid, $this->type->convertToPHPValue($ulid, new SQLitePlatform()));`
`130`	`133`	`}`
`131`	`134`
`132`	`135`	`public function testGetName()`
`@@ -155,6 +158,6 @@ public static function provideSqlDeclarations(): \Generator`
`155`	`158`
`156`	`159`	`public function testRequiresSQLCommentHint()`
`157`	`160`	`{`
`158`		`- $this->assertTrue($this->type->requiresSQLCommentHint(new SqlitePlatform()));`
	`161`	`+ $this->assertTrue($this->type->requiresSQLCommentHint(new SQLitePlatform()));`
`159`	`162`	`}`
`160`	`163`	`}`