From 3371db9f8cd332932495eaa592ccbbf0e9c66729 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Thu, 1 Jun 2017 14:40:39 +0200
Subject: [PATCH] Fix optional cache warmers are always instantiated whereas
 they should be lazy-loaded

---
 .../CacheWarmer/TranslationsCacheWarmer.php   | 22 +++++++++++++++--
 .../Resources/config/translation.xml          |  2 +-
 .../CacheWarmer/TemplateCacheWarmer.php       | 24 +++++++++++++++++--
 .../TwigBundle/Resources/config/twig.xml      |  2 +-
 4 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php
index 223f0216ba9ad..33f94650449fb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;
 
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface;
 use Symfony\Component\Translation\TranslatorInterface;
@@ -22,11 +23,24 @@
  */
 class TranslationsCacheWarmer implements CacheWarmerInterface
 {
+    private $container;
     private $translator;
 
-    public function __construct(TranslatorInterface $translator)
+    /**
+     * TranslationsCacheWarmer constructor.
+     *
+     * @param ContainerInterface|TranslatorInterface $container
+     */
+    public function __construct($container)
     {
-        $this->translator = $translator;
+        // As this cache warmer is optional, dependencies should be lazy-loaded, that's why a container should be injected.
+        if ($container instanceof ContainerInterface) {
+            $this->container = $container;
+        } elseif ($container instanceof TranslatorInterface) {
+            $this->translator = $container;
+        } else {
+            throw new \InvalidArgumentException(sprintf('%s only accepts instance of Symfony\Component\DependencyInjection\ContainerInterface or Symfony\Component\Translation\TranslatorInterface as first argument.', __CLASS__));
+        }
     }
 
     /**
@@ -34,6 +48,10 @@ public function __construct(TranslatorInterface $translator)
      */
     public function warmUp($cacheDir)
     {
+        if (null === $this->translator) {
+            $this->translator = $this->container->get('translator');
+        }
+
         if ($this->translator instanceof WarmableInterface) {
             $this->translator->warmUp($cacheDir);
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
index ea85f517aa399..14226ba93083f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
@@ -159,7 +159,7 @@
         <service id="translation.writer" class="%translation.writer.class%"/>
 
         <service id="translation.warmer" class="Symfony\Bundle\FrameworkBundle\CacheWarmer\TranslationsCacheWarmer" public="false">
-            <argument type="service" id="translator" />
+            <argument type="service" id="service_container" />
             <tag name="kernel.cache_warmer" />
         </service>
     </services>
diff --git a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
index 8946c1a98bb08..9a60a92e85375 100644
--- a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
+++ b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\TwigBundle\CacheWarmer;
 
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 use Twig\Environment;
 use Twig\Error\Error;
@@ -22,12 +23,27 @@
  */
 class TemplateCacheWarmer implements CacheWarmerInterface
 {
+    private $container;
     private $twig;
     private $iterator;
 
-    public function __construct(Environment $twig, \Traversable $iterator)
+    /**
+     * TemplateCacheWarmer constructor.
+     *
+     * @param ContainerInterface|Environment $container
+     * @param \Traversable                   $iterator
+     */
+    public function __construct($container, \Traversable $iterator)
     {
-        $this->twig = $twig;
+        // As this cache warmer is optional, dependencies should be lazy-loaded, that's why a container should be injected.
+        if ($container instanceof ContainerInterface) {
+            $this->container = $container;
+        } elseif ($container instanceof Environment) {
+            $this->twig = $container;
+        } else {
+            throw new \InvalidArgumentException(sprintf('%s only accepts instance of Symfony\Component\DependencyInjection\ContainerInterface or Environment as first argument.', __CLASS__));
+        }
+
         $this->iterator = $iterator;
     }
 
@@ -36,6 +52,10 @@ public function __construct(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);
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
index 86e7c45cd39a8..541ac4a559738 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -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>