Skip to content
/ cache Public

Commit 021db4e

Browse files
committed
Merge branch '6.2' into 6.3
* 6.2: fix Doctrine deprecations fix merge Fix Doctrine deprecations [Validator] Remove internal from methods on non-internal interfaces [PhpUnitBridge] Fix support for the NO_COLOR env var
2 parents a3a3d81 + 8c71fd3 commit 021db4e

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

Adapter/DoctrineDbalAdapter.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
2323
use Doctrine\DBAL\Schema\Schema;
2424
use Doctrine\DBAL\Tools\DsnParser;
25+
use Doctrine\ORM\ORMSetup;
2526
use Symfony\Component\Cache\Exception\InvalidArgumentException;
2627
use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
2728
use Symfony\Component\Cache\Marshaller\MarshallerInterface;
@@ -86,7 +87,7 @@ public function __construct(Connection|string $connOrDsn, string $namespace = ''
8687
$params = ['url' => $connOrDsn];
8788
}
8889

89-
$config = new Configuration();
90+
$config = class_exists(ORMSetup::class) ? ORMSetup::createConfiguration() : new Configuration();
9091
if (class_exists(DefaultSchemaManagerFactory::class)) {
9192
$config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
9293
}

0 commit comments

Comments
 (0)