symfony
diff --git a/‎src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
+15-2Lines changed: 15 additions & 2 deletions b/‎src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
+15-2Lines changed: 15 additions & 2 deletions
diff --git a/‎src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+1-1Lines changed: 1 addition & 1 deletion
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\TwigBundle\CacheWarmer;
 
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 
 /**
@@ -20,12 +21,20 @@
  */
 class TemplateCacheWarmer implements CacheWarmerInterface
 {
+    private $container;
     private $twig;
     private $iterator;
 
-    public function __construct(\Twig_Environment $twig, \Traversable $iterator)
+    public function __construct($container, \Traversable $iterator)
     {
-        $this->twig = $twig;
+        if ($container instanceof ContainerInterface) {
+            $this->container = $container;
+        } elseif ($container instanceof \Twig_Environement) {
+            $this->twig = $container;
+        } else {
+            throw new \InvalidArgumentException(sprintf('%s only accepts instance of ContainerInterface or Twig_environment as first argument.', get_class($this)));
+        }
+
         $this->iterator = $iterator;
     }
 
@@ -34,6 +43,10 @@ public function __construct(\Twig_Environment $twig, \Traversable $iterator)
      */
     public function warmUp($cacheDir)
     {
+        if (null === $this->twig) {
+            $this->twig = $this->container->get('twig');
+        }
+
         foreach ($this->iterator as $template) {
             try {
                 $this->twig->loadTemplate($template);
 
@@ -60,7 +60,7 @@
 
         <service id="twig.template_cache_warmer" class="Symfony\Bundle\TwigBundle\CacheWarmer\TemplateCacheWarmer" public="false">
             <tag name="kernel.cache_warmer" />
-            <argument type="service" id="twig" />
+            <argument type="service" id="service_container" />
             <argument type="service" id="twig.template_iterator" />
         </service>