symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php
Lines changed: 6 additions & 1 deletion b/‎src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php
Lines changed: 6 additions & 1 deletion
diff --git a/‎src/Symfony/Component/HttpKernel/DependencyInjection/LazyLoadingFragmentHandler.php
Lines changed: 8 additions & 7 deletions b/‎src/Symfony/Component/HttpKernel/DependencyInjection/LazyLoadingFragmentHandler.php
Lines changed: 8 additions & 7 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php
Lines changed: 4 additions & 3 deletions b/‎src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php
Lines changed: 4 additions & 3 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Tests/DependencyInjection/LazyLoadingFragmentHandlerTest.php
Lines changed: 12 additions & 2 deletions b/‎src/Symfony/Component/HttpKernel/Tests/DependencyInjection/LazyLoadingFragmentHandlerTest.php
Lines changed: 12 additions & 2 deletions
@@ -11,7 +11,7 @@
 
     <services>
         <service id="fragment.handler" class="Symfony\Component\HttpKernel\DependencyInjection\LazyLoadingFragmentHandler">
-            <argument type="service" id="service_container" />
+            <argument /> <!-- fragment renderer locator -->
             <argument type="service" id="request_stack" />
             <argument>%kernel.debug%</argument>
         </service>
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface;
 
 /**
@@ -43,6 +45,7 @@ public function process(ContainerBuilder $container)
         }
 
         $definition = $container->getDefinition($this->handlerService);
+        $renderers = array();
         foreach ($container->findTaggedServiceIds($this->rendererTag) as $id => $tags) {
             $def = $container->getDefinition($id);
             if (!$def->isPublic()) {
@@ -63,8 +66,10 @@ public function process(ContainerBuilder $container)
             }
 
             foreach ($tags as $tag) {
-                $definition->addMethodCall('addRendererService', array($tag['alias'], $id));
+                $renderers[$tag['alias']] = new Reference($id);
             }
         }
+
+        $definition->replaceArgument(0, new ServiceLocatorArgument($renderers));
     }
 }
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\HttpKernel\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
 
@@ -23,7 +23,7 @@
 class LazyLoadingFragmentHandler extends FragmentHandler
 {
     private $container;
-    private $rendererIds = array();
+    private $initialized = array();
 
     /**
      * Constructor.
@@ -42,23 +42,24 @@ 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
      */
     public function addRendererService($name, $renderer)
     {
-        $this->rendererIds[$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);
     }
 
     /**
      * {@inheritdoc}
      */
     public function render($uri, $renderer = 'inline', array $options = array())
     {
-        if (isset($this->rendererIds[$renderer])) {
-            $this->addRenderer($this->container->get($this->rendererIds[$renderer]));
-
-            unset($this->rendererIds[$renderer]);
+        if (!isset($this->initialized[$renderer]) && $this->container->has($renderer)) {
+            $this->addRenderer($this->container->get($renderer));
+            $this->initialized[$renderer] = true;
         }
 
         return parent::render($uri, $renderer, $options);
 
@@ -14,6 +14,8 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\DependencyInjection\FragmentRendererPass;
 use Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface;
+use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
+use Symfony\Component\DependencyInjection\Reference;
 
 class FragmentRendererPassTest extends \PHPUnit_Framework_TestCase
 {
@@ -59,9 +61,8 @@ public function testValidContentRenderer()
         $renderer = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
         $renderer
             ->expects($this->once())
-            ->method('addMethodCall')
-            ->with('addRendererService', array('foo', 'my_content_renderer'))
-        ;
+            ->method('replaceArgument')
+            ->with(0, $this->equalTo(new ServiceLocatorArgument(array('foo' => new Reference('my_content_renderer')))));
 
         $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
         $definition->expects($this->atLeastOnce())
 
@@ -26,15 +26,25 @@ public function test()
         $requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
         $requestStack->expects($this->any())->method('getCurrentRequest')->will($this->returnValue(Request::create('/')));
 
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
+        $container = $this->getMockBuilder('Psr\Container\ContainerInterface')->getMock();
+        $container->expects($this->once())->method('has')->with('foo')->willReturn(true);
         $container->expects($this->once())->method('get')->will($this->returnValue($renderer));
 
         $handler = new LazyLoadingFragmentHandler($container, $requestStack, false);
-        $handler->addRendererService('foo', 'foo');
 
         $handler->render('/foo', 'foo');
 
         // second call should not lazy-load anymore (see once() above on the get() method)
         $handler->render('/foo', 'foo');
     }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The Symfony\Component\HttpKernel\DependencyInjection\LazyLoadingFragmentHandler::addRendererService() method is deprecated since version 3.3 and will be removed in 4.0.
+     */
+    public function testAddRendererServiceIsDeprecated()
+    {
+        $handler = new LazyLoadingFragmentHandler($this->getMockBuilder('Psr\Container\ContainerInterface')->getMock(), $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock());
+        $handler->addRendererService('foo', 'bar');
+    }
 }