Skip to content

Commit 42714d2

Browse files
committed
Remove comment about DBAL 3
Only DBAL 3 and up can be used now.
1 parent 671e516 commit 42714d2

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

docs/en/configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Configuration Reference
135135
# Affects schema-tool. If absent, DBAL chooses defaults
136136
# based on the platform. Examples here are for MySQL.
137137
# charset: utf8mb4
138-
# collation: utf8mb4_unicode_ci # When using doctrine/dbal 3.x
138+
# collation: utf8mb4_unicode_ci
139139
# engine: InnoDB
140140
141141
# Service identifier of a Psr\Cache\CacheItemPoolInterface implementation

src/DependencyInjection/DoctrineExtension.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,9 +334,11 @@ protected function loadDbalConnection($name, array $connection, ContainerBuilder
334334

335335
$configuration->addMethodCall('setSchemaManagerFactory', [new Reference($connection['schema_manager_factory'])]);
336336

337-
if (isset($connection['result_cache'])) {
338-
$configuration->addMethodCall('setResultCache', [new Reference($connection['result_cache'])]);
337+
if (! isset($connection['result_cache'])) {
338+
return;
339339
}
340+
341+
$configuration->addMethodCall('setResultCache', [new Reference($connection['result_cache'])]);
340342
}
341343

342344
/**

0 commit comments

Comments
 (0)