Merge remote branch 'vicb/one_more_thing'
This commit is contained in:
commit
2d9ae36119
@ -62,7 +62,7 @@ class TwigExtension extends Extension
|
||||
}
|
||||
|
||||
if (!empty($config['cache_warmer'])) {
|
||||
$container->getDefinition('templating.cache_warmer.templates_cache')->addTag('kernel.cache_warmer');
|
||||
$container->getDefinition('twig.cache_warmer')->addTag('kernel.cache_warmer');
|
||||
}
|
||||
|
||||
unset(
|
||||
|
@ -8,7 +8,7 @@
|
||||
<parameter key="twig.class">Twig_Environment</parameter>
|
||||
<parameter key="twig.loader.class">Symfony\Bundle\TwigBundle\Loader\FilesystemLoader</parameter>
|
||||
<parameter key="templating.engine.twig.class">Symfony\Bundle\TwigBundle\TwigEngine</parameter>
|
||||
<parameter key="templating.cache_warmer.templates_cache.class">Symfony\Bundle\TwigBundle\CacheWarmer\TemplateCacheCacheWarmer</parameter>
|
||||
<parameter key="twig.cache_warmer.class">Symfony\Bundle\TwigBundle\CacheWarmer\TemplateCacheCacheWarmer</parameter>
|
||||
</parameters>
|
||||
|
||||
<services>
|
||||
@ -17,7 +17,7 @@
|
||||
<argument>%twig.options%</argument>
|
||||
</service>
|
||||
|
||||
<service id="templating.cache_warmer.templates_cache" class="%templating.cache_warmer.templates_cache.class%" public="false">
|
||||
<service id="twig.cache_warmer" class="%twig.cache_warmer.class%" public="false">
|
||||
<argument type="service" id="service_container" />
|
||||
<argument>%kernel.root_dir%/views</argument>
|
||||
</service>
|
||||
|
@ -34,7 +34,7 @@ class TwigExtensionTest extends TestCase
|
||||
$this->compileContainer($container);
|
||||
|
||||
$this->assertEquals('Twig_Environment', $container->getParameter('twig.class'), '->load() loads the twig.xml file');
|
||||
$this->assertFalse($container->getDefinition('templating.cache_warmer.templates_cache')->hasTag('kernel.cache_warmer'), '->load() does not enable cache warming by default');
|
||||
$this->assertFalse($container->getDefinition('twig.cache_warmer')->hasTag('kernel.cache_warmer'), '->load() does not enable cache warming by default');
|
||||
$this->assertContains('TwigBundle::form.html.twig', $container->getParameter('twig.form.resources'), '->load() includes default template for form resources');
|
||||
|
||||
// Twig options
|
||||
@ -55,7 +55,7 @@ class TwigExtensionTest extends TestCase
|
||||
$this->compileContainer($container);
|
||||
|
||||
$this->assertEquals('Twig_Environment', $container->getParameter('twig.class'), '->load() loads the twig.xml file');
|
||||
$this->assertTrue($container->getDefinition('templating.cache_warmer.templates_cache')->hasTag('kernel.cache_warmer'), '->load() enables cache warming');
|
||||
$this->assertTrue($container->getDefinition('twig.cache_warmer')->hasTag('kernel.cache_warmer'), '->load() enables cache warming');
|
||||
|
||||
// Extensions
|
||||
foreach (array('twig.extension.debug', 'twig.extension.text') as $id) {
|
||||
|
Reference in New Issue
Block a user