Keep legacy feature working

chalasr · chalasr · commit 3e0b7f6e5794 · 2017-02-17T16:58:04.000+01:00
diff --git a/src/Symfony/Bundle/TwigBundle/ContainerAwareRuntimeLoader.php b/src/Symfony/Bundle/TwigBundle/ContainerAwareRuntimeLoader.php
@@ -22,7 +22,6 @@
 class ContainerAwareRuntimeLoader implements \Twig_RuntimeLoaderInterface
 {
     private $container;
-
     /**
      * @deprecated since version 3.3, to be removed in 4.0
      */
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/LazyLoadingFragmentHandler.php b/src/Symfony/Component/HttpKernel/DependencyInjection/LazyLoadingFragmentHandler.php
@@ -23,6 +23,10 @@
 class LazyLoadingFragmentHandler extends FragmentHandler
 {
     private $container;
+    /**
+     * @deprecated since version 3.3, to be removed in 4.0
+     */
+    private $rendererIds = array();
     private $initialized = array();
 
     /**
@@ -42,21 +46,31 @@ public function __construct(ContainerInterface $container, RequestStack $request
     /**
      * Adds a service as a fragment renderer.
      *
-     * @deprecated since version 3.3, to be removed in 4.0
-     *
      * @param string $name     The service name
      * @param string $renderer The render service id
+     *
+     * @deprecated since version 3.3, to be removed in 4.0
      */
     public function addRendererService($name, $renderer)
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
+
+        $this->rendererIds[$name] = $renderer;
     }
 
     /**
      * {@inheritdoc}
      */
     public function render($uri, $renderer = 'inline', array $options = array())
     {
+        // BC 3.x, to be removed in 4.0
+        if (isset($this->rendererIds[$renderer])) {
+            $this->addRenderer($this->container->get($this->rendererIds[$renderer]));
+            unset($this->rendererIds[$renderer]);
+
+            return parent::render($uri, $renderer, $options);
+        }
+
         if (!isset($this->initialized[$renderer]) && $this->container->has($renderer)) {
             $this->addRenderer($this->container->get($renderer));
             $this->initialized[$renderer] = true;

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@`
`22`	`22`	`class ContainerAwareRuntimeLoader implements \Twig_RuntimeLoaderInterface`
`23`	`23`	`{`
`24`	`24`	`private $container;`
`25`		`-`
`26`	`25`	`/**`
`27`	`26`	`* @deprecated since version 3.3, to be removed in 4.0`
`28`	`27`	`*/`