Skip to content

Commit c3bd836

Browse files
[FrameworkBundle] remove references to legacy doctrine cache provider
1 parent 7a1ba05 commit c3bd836

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

DependencyInjection/Configuration.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,6 @@ private function addCacheSection(ArrayNodeDefinition $rootNode, callable $willBe
10451045
->defaultValue('cache.adapter.system')
10461046
->end()
10471047
->scalarNode('directory')->defaultValue('%kernel.cache_dir%/pools/app')->end()
1048-
->scalarNode('default_doctrine_provider')->end()
10491048
->scalarNode('default_psr6_provider')->end()
10501049
->scalarNode('default_redis_provider')->defaultValue('redis://localhost')->end()
10511050
->scalarNode('default_memcached_provider')->defaultValue('memcached://localhost')->end()

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
use Symfony\Component\Cache\Adapter\AdapterInterface;
3434
use Symfony\Component\Cache\Adapter\ArrayAdapter;
3535
use Symfony\Component\Cache\Adapter\ChainAdapter;
36-
use Symfony\Component\Cache\Adapter\DoctrineAdapter;
37-
use Symfony\Component\Cache\Adapter\DoctrineDbalAdapter;
3836
use Symfony\Component\Cache\Adapter\TagAwareAdapter;
3937
use Symfony\Component\Cache\DependencyInjection\CachePoolPass;
4038
use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
@@ -2080,14 +2078,6 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con
20802078
$container->removeDefinition('cache.default_marshaller');
20812079
}
20822080

2083-
if (!class_exists(DoctrineAdapter::class)) {
2084-
$container->removeDefinition('cache.adapter.doctrine');
2085-
}
2086-
2087-
if (!class_exists(DoctrineDbalAdapter::class)) {
2088-
$container->removeDefinition('cache.adapter.doctrine_dbal');
2089-
}
2090-
20912081
$version = new Parameter('container.build_id');
20922082
$container->getDefinition('cache.adapter.apcu')->replaceArgument(2, $version);
20932083
$container->getDefinition('cache.adapter.system')->replaceArgument(2, $version);
@@ -2100,7 +2090,7 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con
21002090
// Inline any env vars referenced in the parameter
21012091
$container->setParameter('cache.prefix.seed', $container->resolveEnvPlaceholders($container->getParameter('cache.prefix.seed'), true));
21022092
}
2103-
foreach (['doctrine', 'psr6', 'redis', 'memcached', 'doctrine_dbal', 'pdo'] as $name) {
2093+
foreach (['psr6', 'redis', 'memcached', 'doctrine_dbal', 'pdo'] as $name) {
21042094
if (isset($config[$name = 'default_'.$name.'_provider'])) {
21052095
$container->setAlias('cache.'.$name, new Alias(CachePoolPass::getServiceProvider($container, $config[$name]), false));
21062096
}

0 commit comments

Comments
 (0)