Skip to content

Commit f78efa2

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [redis-messenger] remove undefined array key warnings do not pass DBAL connections to PDO adapters [HttpFoundation] Fix PHP 8.1 deprecation in isNotModified
2 parents 6cbb542 + 76ea755 commit f78efa2

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

DependencyInjection/Configuration.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Psr\Log\LogLevel;
1717
use Symfony\Bundle\FullStack;
1818
use Symfony\Component\Asset\Package;
19+
use Symfony\Component\Cache\Adapter\DoctrineAdapter;
1920
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
2021
use Symfony\Component\Config\Definition\Builder\NodeBuilder;
2122
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -1049,7 +1050,7 @@ private function addCacheSection(ArrayNodeDefinition $rootNode, callable $willBe
10491050
->scalarNode('default_redis_provider')->defaultValue('redis://localhost')->end()
10501051
->scalarNode('default_memcached_provider')->defaultValue('memcached://localhost')->end()
10511052
->scalarNode('default_doctrine_dbal_provider')->defaultValue('database_connection')->end()
1052-
->scalarNode('default_pdo_provider')->defaultValue($willBeAvailable('doctrine/dbal', Connection::class) ? 'database_connection' : null)->end()
1053+
->scalarNode('default_pdo_provider')->defaultValue($willBeAvailable('doctrine/dbal', Connection::class) && class_exists(DoctrineAdapter::class) ? 'database_connection' : null)->end()
10531054
->arrayNode('pools')
10541055
->useAttributeAsKey('name')
10551056
->prototype('array')

0 commit comments

Comments
 (0)