Skip to content

Commit 0428c76

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.4' into 6.3
* 5.4: Fix DBAL 4 compatibility Do not match request twice in HttpUtils
2 parents 7ea9248 + 0f689e0 commit 0428c76

File tree

11 files changed

+32
-29
lines changed

11 files changed

+32
-29
lines changed

‎Form/DoctrineOrmTypeGuesser.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function guessType(string $class, string $property): ?TypeGuess
6060
}
6161

6262
return match ($metadata->getTypeOfField($property)) {
63-
'array',
63+
'array', // DBAL < 4
6464
Types::SIMPLE_ARRAY => new TypeGuess(CollectionType::class, [], Guess::MEDIUM_CONFIDENCE),
6565
Types::BOOLEAN => new TypeGuess(CheckboxType::class, [], Guess::HIGH_CONFIDENCE),
6666
Types::DATETIME_MUTABLE,

‎Middleware/Debug/DBAL3/Statement.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ public function __construct(
3535
string $sql,
3636
private ?Stopwatch $stopwatch = null,
3737
) {
38-
parent::__construct($statement);
39-
4038
$this->query = new Query($sql);
39+
40+
parent::__construct($statement);
4141
}
4242

4343
public function bindParam($param, &$variable, $type = ParameterType::STRING, $length = null): bool

‎Middleware/Debug/Driver.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ public function connect(array $params): ConnectionInterface
4141
$connection,
4242
$this->debugDataHolder,
4343
$this->stopwatch,
44-
$this->connectionName,
44+
$this->connectionName
4545
);
4646
}
4747

4848
return new Connection(
4949
$connection,
5050
$this->debugDataHolder,
5151
$this->stopwatch,
52-
$this->connectionName,
52+
$this->connectionName
5353
);
5454
}
5555
}

‎Middleware/Debug/Query.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function stop(): void
4545
}
4646
}
4747

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
4949
{
5050
// Numeric indexes start at 0 in profiler
5151
$idx = \is_int($param) ? $param - 1 : $param;
@@ -87,7 +87,7 @@ public function getParams(): array
8787
}
8888

8989
/**
90-
* @return array<ParameterType|int>
90+
* @return array<int, int|ParameterType>
9191
*/
9292
public function getTypes(): array
9393
{

‎PropertyInfo/DoctrineExtractor.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ public function getTypes(string $class, string $property, array $context = []):
159159
break;
160160
case Type::BUILTIN_TYPE_ARRAY:
161161
switch ($typeOfField) {
162-
case 'array':
163-
case 'json_array':
162+
case 'array': // DBAL < 4
163+
case 'json_array': // DBAL < 3
164164
// return null if $enumType is set, because we can't determine if collectionKeyType is string or int
165165
if ($enumType) {
166166
return null;
@@ -257,7 +257,7 @@ private function getPhpType(string $doctrineType): ?string
257257
Types::BOOLEAN => Type::BUILTIN_TYPE_BOOL,
258258
Types::BLOB,
259259
Types::BINARY => Type::BUILTIN_TYPE_RESOURCE,
260-
'object',
260+
'object', // DBAL < 4
261261
Types::DATE_MUTABLE,
262262
Types::DATETIME_MUTABLE,
263263
Types::DATETIMETZ_MUTABLE,
@@ -268,9 +268,9 @@ private function getPhpType(string $doctrineType): ?string
268268
Types::DATETIMETZ_IMMUTABLE,
269269
Types::TIME_IMMUTABLE,
270270
Types::DATEINTERVAL => Type::BUILTIN_TYPE_OBJECT,
271-
'array',
272-
Types::SIMPLE_ARRAY,
273-
'json_array' => Type::BUILTIN_TYPE_ARRAY,
271+
'array', // DBAL < 4
272+
'json_array', // DBAL < 3
273+
Types::SIMPLE_ARRAY => Type::BUILTIN_TYPE_ARRAY,
274274
default => null,
275275
};
276276
}

‎Tests/DataCollector/DoctrineDataCollectorWithDebugStackTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class DoctrineDataCollectorWithDebugStackTest extends TestCase
3535
public static function setUpBeforeClass(): void
3636
{
3737
if (!class_exists(DebugStack::class)) {
38-
self::markTestSkipped('This test requires DBAL < 4');
38+
self::markTestSkipped('This test requires DBAL < 4.');
3939
}
4040
}
4141

‎Tests/Fixtures/Type/StringWrapperType.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616

1717
class StringWrapperType extends StringType
1818
{
19-
public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed
19+
public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
2020
{
2121
return $value instanceof StringWrapper ? $value->getString() : null;
2222
}
2323

24-
public function convertToPHPValue($value, AbstractPlatform $platform): mixed
24+
public function convertToPHPValue($value, AbstractPlatform $platform): StringWrapper
2525
{
2626
return new StringWrapper($value);
2727
}

‎Tests/Logger/DbalLoggerTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class DbalLoggerTest extends TestCase
2424
public static function setUpBeforeClass(): void
2525
{
2626
if (!class_exists(SQLLogger::class)) {
27-
self::markTestSkipped('This test requires DBAL < 4');
27+
self::markTestSkipped('This test requires DBAL < 4.');
2828
}
2929
}
3030

‎Tests/PropertyInfo/Fixtures/DoctrineFooType.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla
3232
return $platform->getClobTypeDeclarationSQL([]);
3333
}
3434

35-
public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed
35+
public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
3636
{
3737
if (null === $value) {
3838
return null;
@@ -44,7 +44,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): mixe
4444
return $foo->bar;
4545
}
4646

47-
public function convertToPHPValue($value, AbstractPlatform $platform): mixed
47+
public function convertToPHPValue($value, AbstractPlatform $platform): ?Foo
4848
{
4949
if (null === $value) {
5050
return null;

‎Tests/Types/UlidTypeTest.php‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ class_exists('Doctrine\DBAL\Platforms\PostgreSqlPlatform');
2828
// DBAL 3 compatibility
2929
class_exists('Doctrine\DBAL\Platforms\SqlitePlatform');
3030

31+
// DBAL 3 compatibility
32+
class_exists('Doctrine\DBAL\Platforms\SqlitePlatform');
33+
3134
final class UlidTypeTest extends TestCase
3235
{
3336
private const DUMMY_ULID = '01EEDQEK6ZAZE93J8KG5B4MBJC';
@@ -87,25 +90,25 @@ public function testNotSupportedTypeConversionForDatabaseValue()
8790
{
8891
$this->expectException(ConversionException::class);
8992

90-
$this->type->convertToDatabaseValue(new \stdClass(), new SqlitePlatform());
93+
$this->type->convertToDatabaseValue(new \stdClass(), new SQLitePlatform());
9194
}
9295

9396
public function testNullConversionForDatabaseValue()
9497
{
95-
$this->assertNull($this->type->convertToDatabaseValue(null, new SqlitePlatform()));
98+
$this->assertNull($this->type->convertToDatabaseValue(null, new SQLitePlatform()));
9699
}
97100

98101
public function testUlidInterfaceConvertsToPHPValue()
99102
{
100103
$ulid = $this->createMock(AbstractUid::class);
101-
$actual = $this->type->convertToPHPValue($ulid, new SqlitePlatform());
104+
$actual = $this->type->convertToPHPValue($ulid, new SQLitePlatform());
102105

103106
$this->assertSame($ulid, $actual);
104107
}
105108

106109
public function testUlidConvertsToPHPValue()
107110
{
108-
$ulid = $this->type->convertToPHPValue(self::DUMMY_ULID, new SqlitePlatform());
111+
$ulid = $this->type->convertToPHPValue(self::DUMMY_ULID, new SQLitePlatform());
109112

110113
$this->assertInstanceOf(Ulid::class, $ulid);
111114
$this->assertEquals(self::DUMMY_ULID, $ulid->__toString());
@@ -115,19 +118,19 @@ public function testInvalidUlidConversionForPHPValue()
115118
{
116119
$this->expectException(ConversionException::class);
117120

118-
$this->type->convertToPHPValue('abcdefg', new SqlitePlatform());
121+
$this->type->convertToPHPValue('abcdefg', new SQLitePlatform());
119122
}
120123

121124
public function testNullConversionForPHPValue()
122125
{
123-
$this->assertNull($this->type->convertToPHPValue(null, new SqlitePlatform()));
126+
$this->assertNull($this->type->convertToPHPValue(null, new SQLitePlatform()));
124127
}
125128

126129
public function testReturnValueIfUlidForPHPValue()
127130
{
128131
$ulid = new Ulid();
129132

130-
$this->assertSame($ulid, $this->type->convertToPHPValue($ulid, new SqlitePlatform()));
133+
$this->assertSame($ulid, $this->type->convertToPHPValue($ulid, new SQLitePlatform()));
131134
}
132135

133136
public function testGetName()
@@ -156,6 +159,6 @@ public static function provideSqlDeclarations(): \Generator
156159

157160
public function testRequiresSQLCommentHint()
158161
{
159-
$this->assertTrue($this->type->requiresSQLCommentHint(new SqlitePlatform()));
162+
$this->assertTrue($this->type->requiresSQLCommentHint(new SQLitePlatform()));
160163
}
161164
}

0 commit comments

Comments
 (0)