Skip to content

Commit

Permalink
Merge branch '5.4' into 6.3
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nicolas-grekas committed Oct 12, 2023
2 parents cde6dbd + f411119 commit 714c521
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
15 changes: 12 additions & 3 deletions Tests/Store/DoctrineDbalStoreTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,22 @@ public function testCreatesTableInTransaction(string $platform)
$store->save($key);
}

public static function providePlatforms()
public static function providePlatforms(): \Generator
{
yield [\Doctrine\DBAL\Platforms\PostgreSQLPlatform::class];
yield [\Doctrine\DBAL\Platforms\PostgreSQL94Platform::class];

// DBAL < 4
if (class_exists(\Doctrine\DBAL\Platforms\PostgreSQL94Platform::class)) {
yield [\Doctrine\DBAL\Platforms\PostgreSQL94Platform::class];
}

yield [\Doctrine\DBAL\Platforms\SqlitePlatform::class];
yield [\Doctrine\DBAL\Platforms\SQLServerPlatform::class];
yield [\Doctrine\DBAL\Platforms\SQLServer2012Platform::class];

// DBAL < 4
if (class_exists(\Doctrine\DBAL\Platforms\SQLServer2012Platform::class)) {
yield [\Doctrine\DBAL\Platforms\SQLServer2012Platform::class];
}
}

public function testTableCreationInTransactionNotSupported()
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"symfony/deprecation-contracts": "^2.5|^3"
},
"require-dev": {
"doctrine/dbal": "^2.13|^3.0",
"doctrine/dbal": "^2.13|^3|^4",
"predis/predis": "^1.1|^2.0"
},
"conflict": {
Expand Down

0 comments on commit 714c521

Please sign in to comment.