Implement ServiceSubscriberInterface in optional cache warmers

romainneutron · romainneutron · commit e75a8bbd0ea1 · 2017-06-02T16:40:35.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;
 
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface;
 use Symfony\Component\Translation\TranslatorInterface;
@@ -21,7 +21,7 @@
  *
  * @author Xavier Leune <xavier.leune@gmail.com>
  */
-class TranslationsCacheWarmer implements CacheWarmerInterface
+class TranslationsCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterface
 {
     private $container;
     private $translator;
@@ -39,7 +39,7 @@ public function __construct($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__));
+            throw new \InvalidArgumentException(sprintf('%s only accepts instance of Psr\Container\ContainerInterface as first argument.', __CLASS__));
         }
     }
 
@@ -64,4 +64,14 @@ public function isOptional()
     {
         return true;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getSubscribedServices()
+    {
+        return array(
+            'translator' => TranslatorInterface::class,
+        );
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
@@ -123,8 +123,9 @@
         <service id="translation.writer" class="Symfony\Component\Translation\Writer\TranslationWriter" public="true" />
 
         <service id="translation.warmer" class="Symfony\Bundle\FrameworkBundle\CacheWarmer\TranslationsCacheWarmer">
-            <argument type="service" id="service_container" />
+            <tag name="container.service_subscriber" id="translator" />
             <tag name="kernel.cache_warmer" />
+            <argument type="service" id="Psr\Container\ContainerInterface" />
         </service>
 
         <service id="translator_listener" class="Symfony\Component\HttpKernel\EventListener\TranslatorListener" public="true">
diff --git a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
@@ -11,7 +11,8 @@
 
 namespace Symfony\Bundle\TwigBundle\CacheWarmer;
 
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Psr\Container\ContainerInterface;
+use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 use Twig\Environment;
 use Twig\Error\Error;
@@ -21,7 +22,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class TemplateCacheWarmer implements CacheWarmerInterface
+class TemplateCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterface
 {
     private $container;
     private $twig;
@@ -41,7 +42,7 @@ public function __construct($container, \Traversable $iterator)
         } 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__));
+            throw new \InvalidArgumentException(sprintf('%s only accepts instance of Psr\Container\ContainerInterface as first argument.', __CLASS__));
         }
 
         $this->iterator = $iterator;
@@ -73,4 +74,14 @@ public function isOptional()
     {
         return true;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getSubscribedServices()
+    {
+        return array(
+            'twig' => Environment::class,
+        );
+    }
 }
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -45,7 +45,8 @@
 
         <service id="twig.template_cache_warmer" class="Symfony\Bundle\TwigBundle\CacheWarmer\TemplateCacheWarmer">
             <tag name="kernel.cache_warmer" />
-            <argument type="service" id="service_container" />
+            <tag name="container.service_subscriber" id="twig" />
+            <argument type="service" id="Psr\Container\ContainerInterface" />
             <argument type="service" id="twig.template_iterator" />
         </service>
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;`
`13`	`13`
`14`		`-use Symfony\Component\DependencyInjection\ContainerInterface;`
	`14`	`+use Psr\Container\ContainerInterface;`
`15`	`15`	`use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;`
`16`	`16`	`use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface;`
`17`	`17`	`use Symfony\Component\Translation\TranslatorInterface;`
`@@ -21,7 +21,7 @@`
`21`	`21`	`*`
`22`	`22`	`* @author Xavier Leune <xavier.leune@gmail.com>`
`23`	`23`	`*/`
`24`		`-class TranslationsCacheWarmer implements CacheWarmerInterface`
	`24`	`+class TranslationsCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterface`
`25`	`25`	`{`
`26`	`26`	`private $container;`
`27`	`27`	`private $translator;`
`@@ -39,7 +39,7 @@ public function __construct($container)`
`39`	`39`	`} elseif ($container instanceof TranslatorInterface) {`
`40`	`40`	`$this->translator = $container;`
`41`	`41`	`} else {`
`42`		`- throw new \InvalidArgumentException(sprintf('%s only accepts instance of Symfony\Component\DependencyInjection\ContainerInterface or Symfony\Component\Translation\TranslatorInterface as first argument.', __CLASS__));`
	`42`	`+ throw new \InvalidArgumentException(sprintf('%s only accepts instance of Psr\Container\ContainerInterface as first argument.', __CLASS__));`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`@@ -64,4 +64,14 @@ public function isOptional()`
`64`	`64`	`{`
`65`	`65`	`return true;`
`66`	`66`	`}`
	`67`	`+`
	`68`	`+ /**`
	`69`	`+ * {@inheritdoc}`
	`70`	`+ */`
	`71`	`+ public static function getSubscribedServices()`
	`72`	`+ {`
	`73`	`+ return array(`
	`74`	`+ 'translator' => TranslatorInterface::class,`
	`75`	`+ );`
	`76`	`+ }`
`67`	`77`	`}`