Skip to content

Commit 714c521

Browse files
Merge branch '5.4' into 6.3
* 5.4: [FrameworkBundle] Configure `logger` as error logger if the Monolog Bundle is not registered DX: PHP CS Fixer - drop explicit nullable_type_declaration_for_default_null_value config, as it's part of ruleset anyway Revert "Add keyword `dev` to leverage composer hint" [Validator] Add missing Ukrainian translations #51960 [Validator] Add missing translations for Indonesian (id) [Validator] Add missing translations for Vietnamese (VI) Add missing Validator translations - Croatian (hr) Run high-deps tests with ORM 3 and DBAL 4 [FrameworkBundle] Fix calling Kernel::warmUp() when running cache:warmup
2 parents cde6dbd + f411119 commit 714c521

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

Tests/Store/DoctrineDbalStoreTest.php

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,22 @@ public function testCreatesTableInTransaction(string $platform)
145145
$store->save($key);
146146
}
147147

148-
public static function providePlatforms()
148+
public static function providePlatforms(): \Generator
149149
{
150150
yield [\Doctrine\DBAL\Platforms\PostgreSQLPlatform::class];
151-
yield [\Doctrine\DBAL\Platforms\PostgreSQL94Platform::class];
151+
152+
// DBAL < 4
153+
if (class_exists(\Doctrine\DBAL\Platforms\PostgreSQL94Platform::class)) {
154+
yield [\Doctrine\DBAL\Platforms\PostgreSQL94Platform::class];
155+
}
156+
152157
yield [\Doctrine\DBAL\Platforms\SqlitePlatform::class];
153158
yield [\Doctrine\DBAL\Platforms\SQLServerPlatform::class];
154-
yield [\Doctrine\DBAL\Platforms\SQLServer2012Platform::class];
159+
160+
// DBAL < 4
161+
if (class_exists(\Doctrine\DBAL\Platforms\SQLServer2012Platform::class)) {
162+
yield [\Doctrine\DBAL\Platforms\SQLServer2012Platform::class];
163+
}
155164
}
156165

157166
public function testTableCreationInTransactionNotSupported()

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"symfony/deprecation-contracts": "^2.5|^3"
2222
},
2323
"require-dev": {
24-
"doctrine/dbal": "^2.13|^3.0",
24+
"doctrine/dbal": "^2.13|^3|^4",
2525
"predis/predis": "^1.1|^2.0"
2626
},
2727
"conflict": {

0 commit comments

Comments
 (0)