Skip to content

Commit d359415

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: reflect Cache component version dependent default value in test
2 parents 42d04d6 + addf595 commit d359415

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Tests/DependencyInjection/ConfigurationTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use PHPUnit\Framework\TestCase;
1616
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Configuration;
1717
use Symfony\Bundle\FullStack;
18+
use Symfony\Component\Cache\Adapter\DoctrineAdapter;
1819
use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
1920
use Symfony\Component\Config\Definition\Processor;
2021
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -501,7 +502,7 @@ protected static function getBundleDefaultConfig()
501502
'default_redis_provider' => 'redis://localhost',
502503
'default_memcached_provider' => 'memcached://localhost',
503504
'default_doctrine_dbal_provider' => 'database_connection',
504-
'default_pdo_provider' => ContainerBuilder::willBeAvailable('doctrine/dbal', Connection::class, ['symfony/framework-bundle']) ? 'database_connection' : null,
505+
'default_pdo_provider' => ContainerBuilder::willBeAvailable('doctrine/dbal', Connection::class, ['symfony/framework-bundle']) && class_exists(DoctrineAdapter::class) ? 'database_connection' : null,
505506
'prefix_seed' => '_%kernel.project_dir%.%kernel.container_class%',
506507
],
507508
'workflows' => [

0 commit comments

Comments
 (0)