From 1240690cacd5a9687ed988104cb33201864adf72 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sun, 6 Jan 2013 09:31:07 +0100
Subject: [PATCH] [HttpKernel] made the strategy a regular parameter in
 HttpContentRenderer::render()

---
 .../Twig/Extension/HttpKernelExtension.php      |  9 +++++----
 .../Bundle/FrameworkBundle/HttpKernel.php       |  5 ++++-
 .../Templating/Helper/ActionsHelper.php         |  5 ++++-
 .../HttpKernel/HttpContentRenderer.php          | 17 ++++++++++-------
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php
index 14d5a5c8ad..22ded3d197 100644
--- a/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php
@@ -54,14 +54,15 @@ class HttpKernelExtension extends \Twig_Extension
      */
     public function render($uri, $options = array())
     {
-        return $this->renderer->render($uri, $options);
+        $strategy = isset($options['strategy']) ? $options['strategy'] : 'default';
+        unset($options['strategy']);
+
+        return $this->renderer->render($uri, $strategy, $options);
     }
 
     public function renderStrategy($strategy, $uri, $options = array())
     {
-        $options['strategy'] = $strategy;
-
-        return $this->renderer->render($uri, $options);
+        return $this->renderer->render($uri, $strategy, $options);
     }
 
     public function controller($controller, $attributes = array(), $query = array())
diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php b/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php
index 12dc5e80ff..812784b737 100644
--- a/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php
+++ b/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php
@@ -101,6 +101,9 @@ class HttpKernel extends BaseHttpKernel
     {
         trigger_error('render() is deprecated since version 2.2 and will be removed in 2.3. Use Symfony\Component\HttpKernel\HttpContentRenderer::render() instead.', E_USER_DEPRECATED);
 
-        $this->container->get('http_content_renderer')->render($uri, $options);
+        $strategy = isset($options['strategy']) ? $options['strategy'] : 'default';
+        unset($options['strategy']);
+
+        $this->container->get('http_content_renderer')->render($uri, $strategy, $options);
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php
index cc5f486fa1..94c7698294 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php
@@ -46,7 +46,10 @@ class ActionsHelper extends Helper
      */
     public function render($uri, array $options = array())
     {
-        return $this->renderer->render($uri, $options);
+        $strategy = isset($options['strategy']) ? $options['strategy'] : 'default';
+        unset($options['strategy']);
+
+        return $this->renderer->render($uri, $strategy, $options);
     }
 
     public function controller($controller, $attributes = array(), $query = array())
diff --git a/src/Symfony/Component/HttpKernel/HttpContentRenderer.php b/src/Symfony/Component/HttpKernel/HttpContentRenderer.php
index 5344917ee1..94e35bb15d 100644
--- a/src/Symfony/Component/HttpKernel/HttpContentRenderer.php
+++ b/src/Symfony/Component/HttpKernel/HttpContentRenderer.php
@@ -81,23 +81,26 @@ class HttpContentRenderer implements EventSubscriberInterface
      * When the Response is a StreamedResponse, the content is streamed immediately
      * instead of being returned.
      *
-     *  * ignore_errors: true to return an empty string in case of an error
-     *  * strategy:      the strategy to use for rendering
+     * Available options:
      *
-     * @param string|ControllerReference $uri     A URI as a string or a ControllerReference instance
-     * @param array                      $options An array of options
+     *  * ignore_errors: true to return an empty string in case of an error
+     *
+     * @param string|ControllerReference $uri      A URI as a string or a ControllerReference instance
+     * @param string                     $strategy The strategy to use for the rendering
+     * @param array                      $options  An array of options
      *
      * @return string|null The Response content or null when the Response is streamed
      */
-    public function render($uri, array $options = array())
+    public function render($uri, $strategy = 'default', array $options = array())
     {
         if (!isset($options['ignore_errors'])) {
             $options['ignore_errors'] = !$this->debug;
         }
 
         $options = $this->fixOptions($options);
-
-        $strategy = isset($options['strategy']) ? $options['strategy'] : 'default';
+        if (isset($options['strategy'])) {
+            $strategy = $options['strategy'];
+        }
 
         if (!isset($this->strategies[$strategy])) {
             throw new \InvalidArgumentException(sprintf('The "%s" rendering strategy does not exist.', $strategy));