moved the deprecation logic calls outside the new HttpContentRenderer class

fabpot · fabpot · commit 2eea7682e76e · 2013-01-10T09:21:32.000+01:00
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;

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,8 @@ public function getFunctions()`
`54`	`54`	`*/`
`55`	`55`	`public function render($uri, $options = array())`
`56`	`56`	`{`
	`57`	`+ $options = $this->renderer->fixOptions($options);`
	`58`	`+`
`57`	`59`	`$strategy = isset($options['strategy']) ? $options['strategy'] : 'default';`
`58`	`60`	`unset($options['strategy']);`
`59`	`61`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,8 @@ public function render($uri, array $options = array())`
`105`	`105`	`{`
`106`	`106`	`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);`
`107`	`107`
	`108`	`+ $options = $this->renderer->fixOptions($options);`
	`109`	`+`
`108`	`110`	`$strategy = isset($options['strategy']) ? $options['strategy'] : 'default';`
`109`	`111`	`unset($options['strategy']);`
`110`	`112`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ public function __construct(HttpContentRenderer $renderer)`
`46`	`46`	`*/`
`47`	`47`	`public function render($uri, array $options = array())`
`48`	`48`	`{`
	`49`	`+ $options = $this->renderer->fixOptions($options);`
	`50`	`+`
`49`	`51`	`$strategy = isset($options['strategy']) ? $options['strategy'] : 'default';`
`50`	`52`	`unset($options['strategy']);`
`51`	`53`
Original file line number	Diff line number	Diff line change
`@@ -97,11 +97,6 @@ public function render($uri, $strategy = 'default', array $options = array())`
`97`	`97`	`$options['ignore_errors'] = !$this->debug;`
`98`	`98`	`}`
`99`	`99`
`100`		`- $options = $this->fixOptions($options);`
`101`		`- if (isset($options['strategy'])) {`
`102`		`- $strategy = $options['strategy'];`
`103`		`- }`
`104`		`-`
`105`	`100`	`if (!isset($this->strategies[$strategy])) {`
`106`	`101`	`throw new \InvalidArgumentException(sprintf('The "%s" rendering strategy does not exist.', $strategy));`
`107`	`102`	`}`
`@@ -118,7 +113,7 @@ public static function getSubscribedEvents()`
`118`	`113`	`}`
`119`	`114`
`120`	`115`	`// to be removed in 2.3`
`121`		`- private function fixOptions($options)`
	`116`	`+ public function fixOptions(array $options)`
`122`	`117`	`{`
`123`	`118`	`// support for the standalone option is @deprecated in 2.2 and replaced with the strategy option`
`124`	`119`	`if (isset($options['standalone'])) {`
`@@ -136,6 +131,7 @@ private function fixOptions($options)`
`136`	`131`	`}`
`137`	`132`
`138`	`133`	`$options['strategy'] = $options['standalone'];`
	`134`	`+ unset($options['standalone']);`
`139`	`135`	`}`
`140`	`136`
`141`	`137`	`return $options;`