diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FrameworkBundle] define doctrine as default_pdo_provider only if the package is installed

Browse Source
This commit is contained in:
Nicolas Grekas 2018-12-01 09:31:03 +01:00
parent b869fc1db6
commit cf7501299d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
View File

@ -13,6 +13,7 @@ namespace Symfony\Bundle\FrameworkBundle\DependencyInjection;
use Doctrine\Common\Annotations\Annotation; use Doctrine\Common\Annotations\Annotation;
use Doctrine\Common\Cache\Cache; use Doctrine\Common\Cache\Cache;
use Doctrine\DBAL\Connection;
use Symfony\Bundle\FullStack; use Symfony\Bundle\FullStack;
use Symfony\Component\Asset\Package; use Symfony\Component\Asset\Package;
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
@ -882,7 +883,7 @@ class Configuration implements ConfigurationInterface
->scalarNode('default_psr6_provider')->end() ->scalarNode('default_psr6_provider')->end()
->scalarNode('default_redis_provider')->defaultValue('redis://localhost')->end() ->scalarNode('default_redis_provider')->defaultValue('redis://localhost')->end()
->scalarNode('default_memcached_provider')->defaultValue('memcached://localhost')->end() ->scalarNode('default_memcached_provider')->defaultValue('memcached://localhost')->end()
->scalarNode('default_pdo_provider')->defaultValue('doctrine.dbal.default_connection')->end() ->scalarNode('default_pdo_provider')->defaultValue(class_exists(Connection::class) ? 'database_connection' : null)->end()
->arrayNode('pools') ->arrayNode('pools')
->useAttributeAsKey('name') ->useAttributeAsKey('name')
->prototype('array') ->prototype('array')

3
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
View File

@ -11,6 +11,7 @@
namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection; namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection;
use Doctrine\DBAL\Connection;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Configuration; use Symfony\Bundle\FrameworkBundle\DependencyInjection\Configuration;
use Symfony\Bundle\FullStack; use Symfony\Bundle\FullStack;
@ -268,7 +269,7 @@ class ConfigurationTest extends TestCase
'directory' => '%kernel.cache_dir%/pools', 'directory' => '%kernel.cache_dir%/pools',
'default_redis_provider' => 'redis://localhost', 'default_redis_provider' => 'redis://localhost',
'default_memcached_provider' => 'memcached://localhost', 'default_memcached_provider' => 'memcached://localhost',
'default_pdo_provider' => 'doctrine.dbal.default_connection', 'default_pdo_provider' => class_exists(Connection::class) ? 'database_connection' : null,
), ),
'workflows' => array( 'workflows' => array(
'enabled' => false, 'enabled' => false,