Merge branch '6.3' into 6.4

* 6.3:
  Fix DBAL 4 compatibility
  [Cache] Fix ArrayAdapter::freeze() return type
  Do not match request twice in HttpUtils

Author: nicolas-grekas

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,

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

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
         );
     }
 }

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
     {

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,
         };
     }

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);
     }

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;

Tests/Types/UlidTypeTest.php

@@ -26,6 +26,9 @@
 // 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';
@@ -84,25 +87,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());
@@ -112,19 +115,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()
@@ -150,6 +153,6 @@ public static function provideSqlDeclarations(): \Generator
 
     public function testRequiresSQLCommentHint()
     {
-        $this->assertTrue($this->type->requiresSQLCommentHint(new SqlitePlatform()));
+        $this->assertTrue($this->type->requiresSQLCommentHint(new SQLitePlatform()));
     }
 }

Types/AbstractUidType.php

@@ -105,9 +105,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);
     }
 }