symfony · mpdude · Nov 5, 2012 · Nov 23, 2012 · Jan 25, 2013 · Jan 25, 2013
diff --git a/src/Symfony/Bundle/FrameworkBundle/Config/FrameworkConfigCacheFactory.php b/src/Symfony/Bundle/FrameworkBundle/Config/FrameworkConfigCacheFactory.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Config;
+
+use Symfony\Component\Config\AbstractConfigCacheFactory;
+use Symfony\Component\Config\ResourceValidatingCache;
+use Symfony\Component\Config\NonvalidatingCache;
+use Symfony\Component\Config\Resource\ResourceValidatorInterface;
+
+/**
+ * This implementation of ConfigCacheFactoryInterface will use a given
+ * set of ResourceValidators to check caches for freshness. If no
+ * ResourceValidators are used, a Non-validating cache will be used.
+ *
+ * @author Matthias Pigulla <mp@webfactory.de>
+ */
+class FrameworkConfigCacheFactory extends AbstractConfigCacheFactory
+{
+    protected $resourceValidators = array();
+
+    public function addResourceValidator(ResourceValidatorInterface $validator)
+    {
+        $this->resourceValidators[] = $validator;
+    }
+
+    public function setResourceValidators(array $validators)
+    {
+        $this->resourceValidators = $validators;
+    }
+
+    public function createCache($cacheFilename)
+    {
+        if ($this->resourceValidators) {
+            $cache = new ResourceValidatingCache($cacheFilename);
+            $cache->setResourceValidators($this->resourceValidators);
+        } else {
+            $cache = new NonvalidatingCache($cacheFilename);
+        }
+        return $cache;
+    }
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CompilerDebugDumpPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CompilerDebugDumpPass.php
@@ -12,16 +12,15 @@
 namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\Config\ConfigCache;
+use Symfony\Component\Config\Util\CacheFileUtils;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 
 class CompilerDebugDumpPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        $cache = new ConfigCache($this->getCompilerLogFilename($container), false);
-        $cache->write(implode("\n", $container->getCompiler()->getLog()));
+        CacheFileUtils::dumpInFile($this->getCompilerLogFilename($container), implode("\n", $container->getCompiler()->getLog()));
     }
 
     public static function getCompilerLogFilename(ContainerInterface $container)

diff --git a/...mfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ConfigResourceValidatorPass.php b/...mfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ConfigResourceValidatorPass.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * Finds ResourceValidators and adds them to the ConfigCache factory service.
+ *
+ * @author Matthias Pigulla <mp@webfactory.de>
+ */
+class ConfigResourceValidatorPass implements CompilerPassInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->hasDefinition('config.cache_factory.default')) {
+            return;
+        }
+
+        $definition = $container->getDefinition('config.cache_factory.default');
+        $debug = $container->getParameter('kernel.debug');
+
+        foreach ($container->findTaggedServiceIds('config.resource_validator') as $id => $attributesList) {
+            foreach ($attributesList as $attributes) {
+                if (!$debug && !(isset($attributes['debugOnly']) && $attributes['debugOnly'] == false)) {
+                    continue;
+                }
+
+                // We must assume that the class value has been correctly filled, even if the service is created by a factory
+                $class = $container->getDefinition($id)->getClass();
+
+                $refClass = new \ReflectionClass($class);
+                $interface = 'Symfony\Component\Config\Resource\ResourceValidatorInterface';
+
+                if (!$refClass->implementsInterface($interface)) {
+                    throw new \InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, $interface));
+                }
+
+                $definition->addMethodCall('addResourceValidator', array(new Reference($id)));
+            }
+        }
+    }
+}
diff --git a/...ony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php b/...ony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php
@@ -14,7 +14,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Dumper\XmlDumper;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\Config\ConfigCache;
+use Symfony\Component\Config\Util\CacheFileUtils;
 
 /**
  * Dumps the ContainerBuilder to a cache file so that it can be used by
@@ -28,7 +28,6 @@ class ContainerBuilderDebugDumpPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         $dumper = new XmlDumper($container);
-        $cache = new ConfigCache($container->getParameter('debug.container.dump'), false);
-        $cache->write($dumper->dump());
+        CacheFileUtils::dumpInFile($container->getParameter('debug.container.dump'), $dumper->dump());
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -104,6 +104,8 @@ public function load(array $configs, ContainerBuilder $container)
             $loader->load('serializer.xml');
         }
 
+        $this->registerConfigCacheConfiguration(array(), $container, $loader);
+
         $this->addClassesToCompile(array(
             'Symfony\\Component\\HttpFoundation\\ParameterBag',
             'Symfony\\Component\\HttpFoundation\\HeaderBag',
@@ -680,6 +682,11 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
         }
     }
 
+    private function registerConfigCacheConfiguration(array $config, ContainerBuilder $container,$loader)
+    {
+        $loader->load('config_cache.xml');
+    }
+
     /**
      * Returns the base path for the XSD files.
      *

diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -27,6 +27,7 @@
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TranslationDumperPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\FragmentRendererPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\SerializerPass;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ConfigResourceValidatorPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\HttpFoundation\Request;
@@ -68,6 +69,7 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new TranslationDumperPass());
         $container->addCompilerPass(new FragmentRendererPass(), PassConfig::TYPE_AFTER_REMOVING);
         $container->addCompilerPass(new SerializerPass());
+        $container->addCompilerPass(new ConfigResourceValidatorPass());
 
         if ($container->getParameter('kernel.debug')) {
             $container->addCompilerPass(new ContainerBuilderDebugDumpPass(), PassConfig::TYPE_AFTER_REMOVING);

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/config_cache.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/config_cache.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <parameters>
+        <parameter key="config.cache_factory.class">Symfony\Bundle\FrameworkBundle\Config\FrameworkConfigCacheFactory</parameter>
+    </parameters>
+
+    <services>
+        <service id="config.cache_factory.default" class="%config.cache_factory.class%" public="false" />
+        <service id="config.cache_factory" alias="config.cache_factory.default" />
+
+        <service class="Symfony\Component\Config\Resource\ResourceInterfaceValidator" public="false">
+            <tag name="config.resource_validator" />
+        </service>
+    </services>
+</container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
@@ -70,6 +70,9 @@
             </argument>
             <argument type="service" id="router.request_context" on-invalid="ignore" />
             <argument type="service" id="logger" on-invalid="ignore" />
+            <call method="setConfigCacheFactory">
+                <argument type="service" id="config.cache_factory"/>
+            </call>
         </service>
 
         <service id="router" alias="router.default" />

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
@@ -42,6 +42,9 @@
                 <argument key="cache_dir">%kernel.cache_dir%/translations</argument>
                 <argument key="debug">%kernel.debug%</argument>
             </argument>
+            <call method="setConfigCacheFactory">
+                <argument type="service" id="config.cache_factory"/>
+            </call>
         </service>
 
         <service id="translator" class="%translator.identity.class%">

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -187,8 +187,13 @@ public function testTranslator()
             '->registerTranslatorConfiguration() finds Security translation resources'
         );
 
-        $calls = $container->getDefinition('translator.default')->getMethodCalls();
-        $this->assertEquals(array('fr'), $calls[0][1][0]);
+        $haveFallbackLocale = false;
+        foreach ($container->getDefinition('translator.default')->getMethodCalls() as $call) {
+            if ('setFallbackLocales' == $call[0] && array('fr') == $call[1][0]) {
+                $haveFallbackLocale = true;
+            }
+        }
+        $this->assertTrue($haveFallbackLocale, '-> setFallbackLocale() is called with the expected value.');
     }
 
     /**

diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
@@ -14,7 +14,9 @@
 use Symfony\Component\Translation\Translator as BaseTranslator;
 use Symfony\Component\Translation\MessageSelector;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\Config\ConfigCache;
+use Symfony\Component\Config\ConfigCacheFactoryInterface;
+use Symfony\Component\Config\DefaultConfigCacheFactory;
+use Symfony\Component\Config\ConfigCacheInterface;
 
 /**
  * Translator.
@@ -26,6 +28,7 @@ class Translator extends BaseTranslator
     protected $container;
     protected $options;
     protected $loaderIds;
+    protected $configCacheFactory;
 
     /**
      * Constructor.
@@ -62,6 +65,30 @@ public function __construct(ContainerInterface $container, MessageSelector $sele
         parent::__construct(null, $selector);
     }
 
+    /**
+     * Sets the configCacheFactory
+     *
+     * @param ConfigCacheFactoryInterface $configCacheFactory
+     */
+    public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory)
+    {
+        $this->configCacheFactory = $configCacheFactory;
+    }
+
+    /**
+     * Returns the configCacheFactory set by setConfigCacheFactory or a BC default implementation
+     *
+     * @return ConfigCacheFactoryInterface $configCacheFactory
+     */
+    private function getConfigCacheFactory()
+    {
+        if (!$this->configCacheFactory) {
+            $this->configCacheFactory = new DefaultConfigCacheFactory($this->options['debug']);
+        }
+
+        return $this->configCacheFactory;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -89,32 +116,44 @@ protected function loadCatalogue($locale)
             return parent::loadCatalogue($locale);
         }
 
-        $cache = new ConfigCache($this->options['cache_dir'].'/catalogue.'.$locale.'.php', $this->options['debug']);
-        if (!$cache->isFresh()) {
-            $this->initialize();
+        $self = $this;
+        $cache = $this->getConfigCacheFactory()->cache($this->options['cache_dir'].'/catalogue.'.$locale.'.php', function ($cache) use ($self, $locale) {
+            $self->fillCache($cache, $locale);
+        });
+
+        if (!isset($this->catalogues[$locale])) {
+            $this->catalogues[$locale] = include $cache;
+        }
+
+    }
+
+    /* This method is only public to allow it to be called from a callback (prior PHP 5.4?) */
+    public function fillCache(ConfigCacheInterface $cache, $locale)
+    {
+        $this->initialize();
 
-            parent::loadCatalogue($locale);
+        parent::loadCatalogue($locale);
 
-            $fallbackContent = '';
-            $current = '';
-            foreach ($this->computeFallbackLocales($locale) as $fallback) {
-                $fallbackContent .= sprintf(<<<EOF
+        $fallbackContent = '';
+        $current = '';
+        foreach ($this->computeFallbackLocales($locale) as $fallback) {
+            $fallbackContent .= sprintf(<<<EOF
 \$catalogue%s = new MessageCatalogue('%s', %s);
 \$catalogue%s->addFallbackCatalogue(\$catalogue%s);
 
 
 EOF
-                    ,
-                    ucfirst($fallback),
-                    $fallback,
-                    var_export($this->catalogues[$fallback]->all(), true),
-                    ucfirst($current),
-                    ucfirst($fallback)
-                );
-                $current = $fallback;
-            }
+                ,
+                ucfirst($fallback),
+                $fallback,
+                var_export($this->catalogues[$fallback]->all(), true),
+                ucfirst($current),
+                ucfirst($fallback)
+            );
+            $current = $fallback;
+        }
 
-            $content = sprintf(<<<EOF
+        $content = sprintf(<<<EOF
 <?php
 
 use Symfony\Component\Translation\MessageCatalogue;
@@ -125,18 +164,13 @@ protected function loadCatalogue($locale)
 return \$catalogue;
 
 EOF
-                ,
-                $locale,
-                var_export($this->catalogues[$locale]->all(), true),
-                $fallbackContent
-            );
-
-            $cache->write($content, $this->catalogues[$locale]->getResources());
-
-            return;
-        }
+            ,
+            $locale,
+            var_export($this->catalogues[$locale]->all(), true),
+            $fallbackContent
+        );
 
-        $this->catalogues[$locale] = include $cache;
+        $cache->write($content, $this->catalogues[$locale]->getResources());
     }
 
     protected function initialize()