[FrameworkBundle] Default to Apcu+Filesystem cache chain

nicolas-grekas · nicolas-grekas · commit 86229408f79e · 2016-05-05T17:37:21.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -560,11 +560,11 @@ private function addCacheSection(ArrayNodeDefinition $rootNode)
                     ->children()
                         ->scalarNode('app')
                             ->info('App related cache pools configuration')
-                            ->defaultValue('cache.adapter.filesystem')
+                            ->defaultValue('cache.adapter.default')
                         ->end()
                         ->scalarNode('system')
                             ->info('System related cache pools configuration')
-                            ->defaultValue('cache.adapter.filesystem')
+                            ->defaultValue('cache.adapter.default')
                         ->end()
                         ->scalarNode('directory')->defaultValue('%kernel.cache_dir%/pools')->end()
                         ->scalarNode('default_doctrine_provider')->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
@@ -6,11 +6,11 @@
 
     <services>
 
-        <service id="cache.app" parent="cache.adapter.filesystem">
+        <service id="cache.app" parent="cache.adapter.default">
             <tag name="cache.pool" />
         </service>
 
-        <service id="cache.system" parent="cache.adapter.filesystem">
+        <service id="cache.system" parent="cache.adapter.default">
             <tag name="cache.pool" />
         </service>
 
@@ -22,6 +22,16 @@
             <tag name="cache.pool" />
         </service>
 
+        <service id="cache.adapter.default" class="Symfony\Component\Cache\Adapter\ChainAdapter" abstract="true">
+            <factory class="Symfony\Component\Cache\Adapter\AbstractAdapter" method="createDefault" />
+            <tag name="cache.pool" clearer="cache.default_clearer" />
+            <tag name="monolog.logger" channel="cache" />
+            <argument /> <!-- namespace -->
+            <argument /> <!-- default lifetime -->
+            <argument>%kernel.cache_dir%/pools</argument>
+            <argument type="service" id="logger" on-invalid="ignore" />
+        </service>
+
         <service id="cache.adapter.apcu" class="Symfony\Component\Cache\Adapter\ApcuAdapter" abstract="true">
             <tag name="cache.pool" clearer="cache.default_clearer" />
             <tag name="monolog.logger" channel="cache" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -268,8 +268,8 @@ protected static function getBundleDefaultConfig()
             ),
             'cache' => array(
                 'pools' => array(),
-                'app' => 'cache.adapter.filesystem',
-                'system' => 'cache.adapter.filesystem',
+                'app' => 'cache.adapter.default',
+                'system' => 'cache.adapter.default',
                 'directory' => '%kernel.cache_dir%/pools',
                 'default_redis_provider' => 'redis://localhost',
             ),
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -14,6 +14,7 @@
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\FrameworkExtension;
 use Symfony\Component\Cache\Adapter\ApcuAdapter;
+use Symfony\Component\Cache\Adapter\ChainAdapter;
 use Symfony\Component\Cache\Adapter\DoctrineAdapter;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Adapter\ProxyAdapter;
@@ -728,6 +729,9 @@ private function assertCachePoolServiceDefinitionIsCreated(ContainerBuilder $con
                 $this->assertSame(DoctrineAdapter::class, $parentDefinition->getClass());
                 break;
             case 'cache.app':
+                if (ChainAdapter::class === $parentDefinition->getClass()) {
+                    break;
+                }
             case 'cache.adapter.filesystem':
                 $this->assertSame(FilesystemAdapter::class, $parentDefinition->getClass());
                 break;
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -14,7 +14,9 @@
 use Psr\Cache\CacheItemInterface;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\Cache\CacheItem;
+use Symfony\Component\Cache\Exception\CacheException;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
@@ -67,6 +69,25 @@ function ($deferred, $namespace, &$expiredIds) {
         );
     }
 
+    public static function createDefault($namespace = '', $defaultLifetime = 0, $directory = null, LoggerInterface $logger = null)
+    {
+        $fs = new FilesystemAdapter($namespace, $defaultLifetime, $directory);
+        if (null !== $logger) {
+            $fs->setLogger($logger);
+        }
+
+        try {
+            $apcu = new ApcuAdapter($namespace, $defaultLifetime / 5);
+            if (null !== $logger) {
+                $apcu->setLogger($logger);
+            }
+
+            return new ChainAdapter(array($apcu, $fs));
+        } catch (CacheException $e) {
+            return $fs;
+        }
+    }
+
     /**
      * Fetches several cache items.
      *
