moved the deprecation logic calls outside the new HttpContentRenderer…

… class
symfony · fabpot · Jan 11, 2013 · Dec 19, 2012 · Jan 3, 2013 · Jan 3, 2013
commit 2eea7682e76e03aeb08064cba1c8a70c29f7ba0d
diff --git a/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php
@@ -54,6 +54,8 @@ public function getFunctions()
      */
     public function render($uri, $options = array())
     {
+        $options = $this->renderer->fixOptions($options);
+
         $strategy = isset($options['strategy']) ? $options['strategy'] : 'default';
         unset($options['strategy']);
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php b/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php
@@ -105,6 +105,8 @@ 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);
 
+        $options = $this->renderer->fixOptions($options);
+
         $strategy = isset($options['strategy']) ? $options['strategy'] : 'default';
         unset($options['strategy']);
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php
@@ -46,6 +46,8 @@ public function __construct(HttpContentRenderer $renderer)
      */
     public function render($uri, array $options = array())
     {
+        $options = $this->renderer->fixOptions($options);
+
         $strategy = isset($options['strategy']) ? $options['strategy'] : 'default';
         unset($options['strategy']);
 

diff --git a/src/Symfony/Component/HttpKernel/HttpContentRenderer.php b/src/Symfony/Component/HttpKernel/HttpContentRenderer.php
@@ -97,11 +97,6 @@ public function render($uri, $strategy = 'default', array $options = array())
             $options['ignore_errors'] = !$this->debug;
         }
 
-        $options = $this->fixOptions($options);
-        if (isset($options['strategy'])) {
-            $strategy = $options['strategy'];
-        }
-
         if (!isset($this->strategies[$strategy])) {
             throw new \InvalidArgumentException(sprintf('The "%s" rendering strategy does not exist.', $strategy));
         }
@@ -118,7 +113,7 @@ public static function getSubscribedEvents()
     }
 
     // to be removed in 2.3
-    private function fixOptions($options)
+    public function fixOptions(array $options)
     {
         // support for the standalone option is @deprecated in 2.2 and replaced with the strategy option
         if (isset($options['standalone'])) {
@@ -136,6 +131,7 @@ private function fixOptions($options)
             }
 
             $options['strategy'] = $options['standalone'];
+            unset($options['standalone']);
         }
 
         return $options;