[HttpKernel] made the strategy a regular parameter in HttpContentRenderer::render()

fabpot · fabpot · commit 1240690cacd5 · 2013-01-10T09:21:31.000+01:00
diff --git a/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php
@@ -54,14 +54,15 @@ public function getFunctions()
      */
     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
@@ -101,6 +101,9 @@ public function render($uri, array $options = array())
     {
         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
@@ -46,7 +46,10 @@ public function __construct(HttpContentRenderer $renderer)
      */
     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
@@ -81,23 +81,26 @@ public function onKernelResponse(FilterResponseEvent $event)
      * When the Response is a StreamedResponse, the content is streamed immediately
      * instead of being returned.
      *
+     * Available options:
+     *
      *  * ignore_errors: true to return an empty string in case of an error
-     *  * strategy:      the strategy to use for rendering
      *
-     * @param string|ControllerReference $uri     A URI as a string or a ControllerReference instance
-     * @param array                      $options An array of options
+     * @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));

Original file line number	Diff line number	Diff line change
`@@ -54,14 +54,15 @@ public function getFunctions()`
`54`	`54`	`*/`
`55`	`55`	`public function render($uri, $options = array())`
`56`	`56`	`{`
`57`		`- return $this->renderer->render($uri, $options);`
	`57`	`+ $strategy = isset($options['strategy']) ? $options['strategy'] : 'default';`
	`58`	`+ unset($options['strategy']);`
	`59`	`+`
	`60`	`+ return $this->renderer->render($uri, $strategy, $options);`
`58`	`61`	`}`
`59`	`62`
`60`	`63`	`public function renderStrategy($strategy, $uri, $options = array())`
`61`	`64`	`{`
`62`		`- $options['strategy'] = $strategy;`
`63`		`-`
`64`		`- return $this->renderer->render($uri, $options);`
	`65`	`+ return $this->renderer->render($uri, $strategy, $options);`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`public function controller($controller, $attributes = array(), $query = array())`
Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,9 @@ public function render($uri, array $options = array())`
`101`	`101`	`{`
`102`	`102`	`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);`
`103`	`103`
`104`		`- $this->container->get('http_content_renderer')->render($uri, $options);`
	`104`	`+ $strategy = isset($options['strategy']) ? $options['strategy'] : 'default';`
	`105`	`+ unset($options['strategy']);`
	`106`	`+`
	`107`	`+ $this->container->get('http_content_renderer')->render($uri, $strategy, $options);`
`105`	`108`	`}`
`106`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,10 @@ public function __construct(HttpContentRenderer $renderer)`
`46`	`46`	`*/`
`47`	`47`	`public function render($uri, array $options = array())`
`48`	`48`	`{`
`49`		`- return $this->renderer->render($uri, $options);`
	`49`	`+ $strategy = isset($options['strategy']) ? $options['strategy'] : 'default';`
	`50`	`+ unset($options['strategy']);`
	`51`	`+`
	`52`	`+ return $this->renderer->render($uri, $strategy, $options);`
`50`	`53`	`}`
`51`	`54`
`52`	`55`	`public function controller($controller, $attributes = array(), $query = array())`