Skip to content

Commit 528187e

Browse files
Merge branch '6.4' into 7.0
* 6.4: (47 commits) Sync .github/expected-missing-return-types.diff [FrameworkBundle] Add void return-type to ErrorLoggerCompilerPass [DoctrineBridge] Fix cross-versions compat [HttpKernel] Handle nullable callback of StreamedResponse [Mailer] Capitalize sender header for Mailgun [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 DX: PHP CS Fixer - drop explicit no_superfluous_phpdoc_tags config, as it's part of ruleset already [DI] Simplify using DI attributes with `ServiceLocator/Iterator`'s [FrameworkBundle] Fix registering workflow.registry 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) [HttpFoundation]  Improve PHPDoc of Cache attribute [Validator] Add missing Spanish (es) translations #51956 [Serializer] Add `XmlEncoder::CDATA_WRAPPING` context option [Finder] Add early directory prunning filter support Add missing dutch translations ...
2 parents e8a7cd2 + c743cb7 commit 528187e

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

Tests/Store/DoctrineDbalStoreTest.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,19 @@ public function testCreatesTableInTransaction(string $platform)
146146
public static function providePlatforms(): \Generator
147147
{
148148
yield [\Doctrine\DBAL\Platforms\PostgreSQLPlatform::class];
149+
150+
// DBAL < 4
151+
if (class_exists(\Doctrine\DBAL\Platforms\PostgreSQL94Platform::class)) {
152+
yield [\Doctrine\DBAL\Platforms\PostgreSQL94Platform::class];
153+
}
154+
149155
yield [\Doctrine\DBAL\Platforms\SqlitePlatform::class];
150156
yield [\Doctrine\DBAL\Platforms\SQLServerPlatform::class];
157+
158+
// DBAL < 4
159+
if (class_exists(\Doctrine\DBAL\Platforms\SQLServer2012Platform::class)) {
160+
yield [\Doctrine\DBAL\Platforms\SQLServer2012Platform::class];
161+
}
151162
}
152163

153164
public function testTableCreationInTransactionNotSupported()

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"psr/log": "^1|^2|^3"
2121
},
2222
"require-dev": {
23-
"doctrine/dbal": "^3.6",
23+
"doctrine/dbal": "^3.6|^4",
2424
"predis/predis": "^1.1|^2.0"
2525
},
2626
"conflict": {

0 commit comments

Comments
 (0)