[FrameworkBundle] Add & use Psr6CacheClearer

Author: nicolas-grekas

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php

@@ -45,19 +45,30 @@ public function process(ContainerBuilder $container)
             if ($pool->isAbstract()) {
                 continue;
             }
+            if (isset($tags[0]['clearer_service'])) {
+                $clearer = $container->getDefinition($tags[0]['clearer_service']);
+            } else {
+                $clearer = null;
+            }
+            unset($tags[0]['clearer_service']);
+
             if (isset($tags[0]['provider_service']) && is_string($tags[0]['provider_service'])) {
                 $tags[0]['provider_service'] = new Reference($tags[0]['provider_service']);
             }
             $i = 0;
             foreach ($attributes as $attr) {
                 if (isset($tags[0][$attr])) {
                     $pool->replaceArgument($i++, $tags[0][$attr]);
-                    unset($tags[0][$attr]);
                 }
+                unset($tags[0][$attr]);
             }
             if (!empty($tags[0])) {
                 throw new \InvalidArgumentException(sprintf('Invalid "cache.pool" tag for service "%s": accepted attributes are "provider_service", "namespace", "default_lifetime" and "directory", found "%s".', $id, implode('", "', array_keys($tags[0]))));
             }
+
+            if (null !== $clearer) {
+                $clearer->addMethodCall('addPool', array(new Reference($id)));
+            }
         }
     }
 

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

@@ -569,6 +569,7 @@ private function addCacheSection(ArrayNodeDefinition $rootNode)
                                     ->integerNode('default_lifetime')->defaultNull()->end()
                                     ->scalarNode('provider_service')->defaultNull()->end()
                                     ->scalarNode('directory')->defaultNull()->end()
+                                    ->scalarNode('clearer_service')->defaultValue('cache.default_pools_clearer')->end()
                                 ->end()
                             ->end()
                         ->end()

src/Symfony/Bundle/FrameworkBundle/Resources/config/cache_pools.xml

@@ -6,6 +6,10 @@
 
     <services>
 
+        <service id="cache.default_pools_clearer" class="Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer" public="false">
+            <tag name="kernel.cache_clearer" />
+        </service>
+
         <service id="cache.adapter.default" alias="cache.adapter.filesystem" />
 
         <service id="cache.adapter.apcu" class="Symfony\Component\Cache\Adapter\ApcuAdapter" abstract="true">

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php

@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+
+class CachePoolsTest extends WebTestCase
+{
+    public function testCachePools()
+    {
+        static::bootKernel();
+        $container = static::$kernel->getContainer();
+
+        $pool = $container->get('cache.pool.test');
+        $this->assertInstanceOf(FilesystemAdapter::class, $pool);
+
+        $key = 'foobar';
+        $pool->deleteItem($key);
+        $item = $pool->getItem($key);
+        $this->assertFalse($item->isHit());
+
+        $item->set('baz');
+        $pool->save($item);
+        $item = $pool->getItem($key);
+        $this->assertTrue($item->isHit());
+
+        $container->get('cache_clearer')->clear($container->getParameter('kernel.cache_dir'));
+        $item = $pool->getItem($key);
+        $this->assertFalse($item->isHit());
+    }
+
+    protected static function createKernel(array $options = array())
+    {
+        return parent::createKernel(array('test_case' => 'CachePools') + $options);
+    }
+}

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/bundles.php

@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+
+return array(
+    new FrameworkBundle(),
+    new TestBundle(),
+);

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/config.yml

@@ -0,0 +1,8 @@
+imports:
+    - { resource: ../config/default.yml }
+
+framework:
+    cache:
+        pools:
+            test:
+                public: true

src/Symfony/Bundle/FrameworkBundle/composer.json

@@ -19,7 +19,7 @@
         "php": ">=5.5.9",
         "symfony/asset": "~2.8|~3.0",
         "symfony/class-loader": "~2.8|~3.0",
-        "symfony/dependency-injection": "~2.8|~3.0",
+        "symfony/dependency-injection": "~3.1",
         "symfony/config": "~2.8|~3.0",
         "symfony/event-dispatcher": "~2.8|~3.0",
         "symfony/http-foundation": "~3.1",

src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php

@@ -57,9 +57,9 @@ public function __construct()
         );
 
         $this->removingPasses = array(
+            new ReplaceAliasByActualDefinitionPass(),
             new RemovePrivateAliasesPass(),
             new RemoveAbstractDefinitionsPass(),
-            new ReplaceAliasByActualDefinitionPass(),
             new RepeatedPass(array(
                 new AnalyzeServiceReferencesPass(),
                 new InlineServiceDefinitionsPass(),
@@ -102,8 +102,7 @@ public function addPass(CompilerPassInterface $pass, $type = self::TYPE_BEFORE_O
             throw new InvalidArgumentException(sprintf('Invalid type "%s".', $type));
         }
 
-        $passes = &$this->$property;
-        $passes[] = $pass;
+        $this->{$property}[] = $pass;
     }
 
     /**

src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php

@@ -15,6 +15,7 @@
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 
 /**
  * This replaces all DefinitionDecorator instances with their equivalent fully
@@ -96,11 +97,12 @@ private function resolveArguments(ContainerBuilder $container, array $arguments,
      */
     private function resolveDefinition(ContainerBuilder $container, DefinitionDecorator $definition)
     {
-        if (!$container->hasDefinition($parent = $definition->getParent())) {
+        try {
+            $parentDef = $container->findDefinition($parent = $definition->getParent());
+        } catch (ServiceNotFoundException $e) {
             throw new RuntimeException(sprintf('The parent definition "%s" defined for definition "%s" does not exist.', $parent, $this->currentId));
         }
 
-        $parentDef = $container->getDefinition($parent);
         if ($parentDef instanceof DefinitionDecorator) {
             $id = $this->currentId;
             $this->currentId = $parent;

src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\CacheClearer;
+
+use Psr\Cache\CacheItemPoolInterface;
+
+/**
+ * @author Nicolas Grekas <[email protected]>
+ */
+class Psr6CacheClearer implements CacheClearerInterface
+{
+    private $pools = array();
+
+    public function addPool(CacheItemPoolInterface $pool)
+    {
+        $this->pools[] = $pool;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function clear($cacheDir)
+    {
+        foreach ($this->pools as $pool) {
+            $pool->clear();
+        }
+    }
+}