Skip to content

Commit d632149

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: Fix CS Fix CS [Validator] Add Polish translation for ISIN constraint
2 parents 99b3b20 + 8eac1a5 commit d632149

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

Store/CombinedStore.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
*/
2828
class CombinedStore implements PersistingStoreInterface, LoggerAwareInterface
2929
{
30-
use LoggerAwareTrait;
3130
use ExpiringStoreTrait;
31+
use LoggerAwareTrait;
3232

3333
/** @var PersistingStoreInterface[] */
3434
private $stores;

Store/PdoStore.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@ private function getDriver(): string
336336
switch (true) {
337337
case $driver instanceof \Doctrine\DBAL\Driver\Mysqli\Driver:
338338
throw new \LogicException(sprintf('The adapter "%s" does not support the mysqli driver, use pdo_mysql instead.', static::class));
339-
340339
case $driver instanceof \Doctrine\DBAL\Driver\AbstractMySQLDriver:
341340
$this->driver = 'mysql';
342341
break;

0 commit comments

Comments
 (0)