merged branch Aitboudad/ticket_7309 (PR #7321)

fabpot · fabpot · commit 6c1e86c3e1e7 · 2013-03-11T18:23:12.000+01:00
This PR was squashed before being merged into the 2.2 branch (closes #7321). Commits ------- 4f3771d [2.2][HttpKernel] fixed wrong option name in FragmentHandler::fixOptions Discussion ---------- [2.2][HttpKernel] fixed wrong option name in FragmentHandler::fixOptions | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #7309 --------------------------------------------------------------------------- by Aitboudad at 2013-03-10T11:38:59Z Hi @fabpot, can you see why all commits has failed on Travis ? --------------------------------------------------------------------------- by henrikbjorn at 2013-03-10T11:42:25Z The test expects the option to be called `renderer` and not `strategy` so you need to change the tests. --------------------------------------------------------------------------- by Aitboudad at 2013-03-10T12:19:19Z @henrikbjorn thanks it's ok, but there is still 1 test :( in Symfony\Component\Form\Tests\Extension\Core\Type\TimeTypeTest::testSetDataDifferentTimezones @bschussek Can you see why :).
diff --git a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
@@ -147,9 +147,9 @@ public static function getSubscribedEvents()
     // to be removed in 2.3
     public function fixOptions(array $options)
     {
-        // support for the standalone option is @deprecated in 2.2 and replaced with the renderer option
+        // support for the standalone option is @deprecated in 2.2 and replaced with the strategy option
         if (isset($options['standalone'])) {
-            trigger_error('The "standalone" option is deprecated in version 2.2 and replaced with the "renderer" option.', E_USER_DEPRECATED);
+            trigger_error('The "standalone" option is deprecated in version 2.2 and replaced with the "strategy" option.', E_USER_DEPRECATED);
 
             // support for the true value is @deprecated in 2.2, will be removed in 2.3
             if (true === $options['standalone']) {
@@ -166,7 +166,7 @@ public function fixOptions(array $options)
                 $options['standalone'] = 'hinclude';
             }
 
-            $options['renderer'] = $options['standalone'];
+            $options['strategy'] = $options['standalone'];
             unset($options['standalone']);
         }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
@@ -76,9 +76,9 @@ public function testFixOptions($expected, $options)
     public function getFixOptionsData()
     {
         return array(
-            array(array('renderer' => 'esi'), array('standalone' => true)),
-            array(array('renderer' => 'esi'), array('standalone' => 'esi')),
-            array(array('renderer' => 'hinclude'), array('standalone' => 'js')),
+            array(array('strategy' => 'esi'), array('standalone' => true)),
+            array(array('strategy' => 'esi'), array('standalone' => 'esi')),
+            array(array('strategy' => 'hinclude'), array('standalone' => 'js')),
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -147,9 +147,9 @@ public static function getSubscribedEvents()`
`147`	`147`	`// to be removed in 2.3`
`148`	`148`	`public function fixOptions(array $options)`
`149`	`149`	`{`
`150`		`- // support for the standalone option is @deprecated in 2.2 and replaced with the renderer option`
	`150`	`+ // support for the standalone option is @deprecated in 2.2 and replaced with the strategy option`
`151`	`151`	`if (isset($options['standalone'])) {`
`152`		`- trigger_error('The "standalone" option is deprecated in version 2.2 and replaced with the "renderer" option.', E_USER_DEPRECATED);`
	`152`	`+ trigger_error('The "standalone" option is deprecated in version 2.2 and replaced with the "strategy" option.', E_USER_DEPRECATED);`
`153`	`153`
`154`	`154`	`// support for the true value is @deprecated in 2.2, will be removed in 2.3`
`155`	`155`	`if (true === $options['standalone']) {`
`@@ -166,7 +166,7 @@ public function fixOptions(array $options)`
`166`	`166`	`$options['standalone'] = 'hinclude';`
`167`	`167`	`}`
`168`	`168`
`169`		`- $options['renderer'] = $options['standalone'];`
	`169`	`+ $options['strategy'] = $options['standalone'];`
`170`	`170`	`unset($options['standalone']);`
`171`	`171`	`}`
`172`	`172`
Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,9 @@ public function testFixOptions($expected, $options)`
`76`	`76`	`public function getFixOptionsData()`
`77`	`77`	`{`
`78`	`78`	`return array(`
`79`		`- array(array('renderer' => 'esi'), array('standalone' => true)),`
`80`		`- array(array('renderer' => 'esi'), array('standalone' => 'esi')),`
`81`		`- array(array('renderer' => 'hinclude'), array('standalone' => 'js')),`
	`79`	`+ array(array('strategy' => 'esi'), array('standalone' => true)),`
	`80`	`+ array(array('strategy' => 'esi'), array('standalone' => 'esi')),`
	`81`	`+ array(array('strategy' => 'hinclude'), array('standalone' => 'js')),`
`82`	`82`	`);`
`83`	`83`	`}`
`84`	`84`