symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+15Lines changed: 15 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+15Lines changed: 15 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+8Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+8Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/cache_pools.xml
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/cache_pools.xml
+1-5Lines changed: 1 addition & 5 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/cache_pools.xml
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/cache_pools.xml
+1-5Lines changed: 1 addition & 5 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+1Lines changed: 1 addition & 0 deletions
@@ -557,7 +557,22 @@ private function addCacheSection(ArrayNodeDefinition $rootNode)
                     ->info('Cache configuration')
                     ->addDefaultsIfNotSet()
                     ->fixXmlConfig('pool')
+                    ->fixXmlConfig('adapter')
                     ->children()
+                        ->arrayNode('adapters')
+                            ->useAttributeAsKey('name')
+                            ->prototype('array')
+                                ->children()
+                                    ->scalarNode('parent')
+                                        ->info('The parent cache pool adapter service.')
+                                    ->end()
+                                    ->integerNode('default_lifetime')->end()
+                                    ->scalarNode('provider')
+                                        ->info('The service name to use as provider when the specified adapter needs one.')
+                                    ->end()
+                                ->end()
+                            ->end()
+                        ->end()
                         ->arrayNode('pools')
                             ->useAttributeAsKey('name')
                             ->prototype('array')
 
@@ -1022,6 +1022,14 @@ private function registerPropertyInfoConfiguration(array $config, ContainerBuild
 
     private function registerCacheConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
+        foreach ($config['adapters'] as $name => $adapterConfig) {
+            $adapterDefinition = clone $container->getDefinition($adapterConfig['parent'] ?: 'cache.adapter.'.$name);
+            $adapterDefinition->setArguments($adapterConfig['provider'] ?: array());
+            $adapterDefinition->setPublic(false);
+
+            $container->setDefinition('cache.adapter.'.$name, $adapterDefinition);
+        }
+
         foreach ($config['pools'] as $name => $poolConfig) {
             $poolDefinition = new DefinitionDecorator($poolConfig['adapter']);
             $poolDefinition->setPublic($poolConfig['public']);
 
@@ -13,11 +13,7 @@
         <service id="cache.adapter.shared" alias="cache.adapter.filesystem" />
         <service id="cache.adapter.local" alias="cache.adapter.filesystem" />
 
-        <service id="cache.pool.shared" parent="cache.adapter.shared">
-            <tag name="cache.pool" clearer="cache.default_pools_clearer" />
-        </service>
-
-        <service id="cache.pool.local" parent="cache.adapter.local">
+        <service id="cache.pool.app" parent="cache.adapter.shared">
             <tag name="cache.pool" clearer="cache.default_pools_clearer" />
         </service>
 
 
@@ -268,6 +268,7 @@ protected static function getBundleDefaultConfig()
                 'packages' => array(),
             ),
             'cache' => array(
+                'adapters' => array(),
                 'pools' => array(),
             ),
         );