Merge branch '2.3' into 2.6

Tobion · Tobion · commit 7711ea96982d · 2015-06-27T22:15:38.000+02:00
Conflicts:
	src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
diff --git a/Extension/Core/EventListener/ResizeFormListener.php b/Extension/Core/EventListener/ResizeFormListener.php
@@ -107,7 +107,7 @@ public function preSubmit(FormEvent $event)
         }
 
         if (!is_array($data) && !($data instanceof \Traversable && $data instanceof \ArrayAccess)) {
-            throw new UnexpectedTypeException($data, 'array or (\Traversable and \ArrayAccess)');
+            $data = array();
         }
 
         // Remove all empty rows
diff --git a/Tests/AbstractBootstrap3LayoutTest.php b/Tests/AbstractBootstrap3LayoutTest.php
@@ -334,7 +334,7 @@ public function testSingleChoiceNonRequired()
     [@class="my&class form-control"]
     [not(@required)]
     [
-        ./option[@value=""][.="[trans][/trans]"]
+        ./option[@value=""][.=""]
         /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
         /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
     ]
@@ -358,7 +358,7 @@ public function testSingleChoiceNonRequiredNoneSelected()
     [@class="my&class form-control"]
     [not(@required)]
     [
-        ./option[@value=""][.="[trans][/trans]"]
+        ./option[@value=""][.=""]
         /following-sibling::option[@value="&a"][not(@selected)][.="[trans]Choice&A[/trans]"]
         /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
     ]
@@ -432,7 +432,7 @@ public function testSingleChoiceRequiredWithPlaceholderViaView()
     [@class="my&class form-control"]
     [@required="required"]
     [
-        ./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]
+        ./option[@value=""][not(@selected)][not(@disabled)][.=""]
         /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
         /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
     ]
@@ -1140,17 +1140,17 @@ public function testBirthDayWithPlaceholder()
         ./select
             [@id="name_month"]
             [@class="form-control"]
-            [./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]]
+            [./option[@value=""][not(@selected)][not(@disabled)][.=""]]
             [./option[@value="1"][@selected="selected"]]
         /following-sibling::select
             [@id="name_day"]
             [@class="form-control"]
-            [./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]]
+            [./option[@value=""][not(@selected)][not(@disabled)][.=""]]
             [./option[@value="1"][@selected="selected"]]
         /following-sibling::select
             [@id="name_year"]
             [@class="form-control"]
-            [./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]]
+            [./option[@value=""][not(@selected)][not(@disabled)][.=""]]
             [./option[@value="1950"][@selected="selected"]]
     ]
     [count(./select)=3]
diff --git a/Tests/AbstractLayoutTest.php b/Tests/AbstractLayoutTest.php
@@ -614,7 +614,7 @@ public function testSingleChoiceNonRequired()
     [@name="name"]
     [not(@required)]
     [
-        ./option[@value=""][.="[trans][/trans]"]
+        ./option[@value=""][.=""]
         /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
         /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
     ]
@@ -637,7 +637,7 @@ public function testSingleChoiceNonRequiredNoneSelected()
     [@name="name"]
     [not(@required)]
     [
-        ./option[@value=""][.="[trans][/trans]"]
+        ./option[@value=""][.=""]
         /following-sibling::option[@value="&a"][not(@selected)][.="[trans]Choice&A[/trans]"]
         /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
     ]
@@ -714,7 +714,7 @@ public function testSingleChoiceRequiredWithPlaceholderViaView()
     [@name="name"]
     [@required="required"]
     [
-        ./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]
+        ./option[@value=""][not(@selected)][not(@disabled)][.=""]
         /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
         /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
     ]
@@ -1342,15 +1342,15 @@ public function testBirthDayWithPlaceholder()
     [
         ./select
             [@id="name_month"]
-            [./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]]
+            [./option[@value=""][not(@selected)][not(@disabled)][.=""]]
             [./option[@value="1"][@selected="selected"]]
         /following-sibling::select
             [@id="name_day"]
-            [./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]]
+            [./option[@value=""][not(@selected)][not(@disabled)][.=""]]
             [./option[@value="1"][@selected="selected"]]
         /following-sibling::select
             [@id="name_year"]
-            [./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]]
+            [./option[@value=""][not(@selected)][not(@disabled)][.=""]]
             [./option[@value="1950"][@selected="selected"]]
     ]
     [count(./select)=3]
diff --git a/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php b/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
@@ -167,15 +167,14 @@ public function testPreSubmitDoesNothingIfNotAllowAddNorAllowDelete()
         $this->assertFalse($this->form->has('2'));
     }
 
-    /**
-     * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException
-     */
-    public function testPreSubmitRequiresArrayOrTraversable()
+    public function testPreSubmitDealsWithNoArrayOrTraversable()
     {
         $data = 'no array or traversable';
         $event = new FormEvent($this->form, $data);
         $listener = new ResizeFormListener('text', array(), false, false);
         $listener->preSubmit($event);
+
+        $this->assertFalse($this->form->has('1'));
     }
 
     public function testPreSubmitDealsWithNullData()

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public function preSubmit(FormEvent $event)`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`if (!is_array($data) && !($data instanceof \Traversable && $data instanceof \ArrayAccess)) {`
`110`		`- throw new UnexpectedTypeException($data, 'array or (\Traversable and \ArrayAccess)');`
	`110`	`+ $data = array();`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`// Remove all empty rows`
Original file line number	Diff line number	Diff line change
`@@ -614,7 +614,7 @@ public function testSingleChoiceNonRequired()`
`614`	`614`	`[@name="name"]`
`615`	`615`	`[not(@required)]`
`616`	`616`	`[`
`617`		`- ./option[@value=""][.="[trans][/trans]"]`
	`617`	`+ ./option[@value=""][.=""]`
`618`	`618`	`/following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]`
`619`	`619`	`/following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]`
`620`	`620`	`]`
`@@ -637,7 +637,7 @@ public function testSingleChoiceNonRequiredNoneSelected()`
`637`	`637`	`[@name="name"]`
`638`	`638`	`[not(@required)]`
`639`	`639`	`[`
`640`		`- ./option[@value=""][.="[trans][/trans]"]`
	`640`	`+ ./option[@value=""][.=""]`
`641`	`641`	`/following-sibling::option[@value="&a"][not(@selected)][.="[trans]Choice&A[/trans]"]`
`642`	`642`	`/following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]`
`643`	`643`	`]`
`@@ -714,7 +714,7 @@ public function testSingleChoiceRequiredWithPlaceholderViaView()`
`714`	`714`	`[@name="name"]`
`715`	`715`	`[@required="required"]`
`716`	`716`	`[`
`717`		`- ./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]`
	`717`	`+ ./option[@value=""][not(@selected)][not(@disabled)][.=""]`
`718`	`718`	`/following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]`
`719`	`719`	`/following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]`
`720`	`720`	`]`
`@@ -1342,15 +1342,15 @@ public function testBirthDayWithPlaceholder()`
`1342`	`1342`	`[`
`1343`	`1343`	`./select`
`1344`	`1344`	`[@id="name_month"]`
`1345`		`- [./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]]`
	`1345`	`+ [./option[@value=""][not(@selected)][not(@disabled)][.=""]]`
`1346`	`1346`	`[./option[@value="1"][@selected="selected"]]`
`1347`	`1347`	`/following-sibling::select`
`1348`	`1348`	`[@id="name_day"]`
`1349`		`- [./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]]`
	`1349`	`+ [./option[@value=""][not(@selected)][not(@disabled)][.=""]]`
`1350`	`1350`	`[./option[@value="1"][@selected="selected"]]`
`1351`	`1351`	`/following-sibling::select`
`1352`	`1352`	`[@id="name_year"]`
`1353`		`- [./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]]`
	`1353`	`+ [./option[@value=""][not(@selected)][not(@disabled)][.=""]]`
`1354`	`1354`	`[./option[@value="1950"][@selected="selected"]]`
`1355`	`1355`	`]`
`1356`	`1356`	`[count(./select)=3]`
Original file line number	Diff line number	Diff line change
`@@ -167,15 +167,14 @@ public function testPreSubmitDoesNothingIfNotAllowAddNorAllowDelete()`
`167`	`167`	`$this->assertFalse($this->form->has('2'));`
`168`	`168`	`}`
`169`	`169`
`170`		`- /**`
`171`		`- * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException`
`172`		`- */`
`173`		`- public function testPreSubmitRequiresArrayOrTraversable()`
	`170`	`+ public function testPreSubmitDealsWithNoArrayOrTraversable()`
`174`	`171`	`{`
`175`	`172`	`$data = 'no array or traversable';`
`176`	`173`	`$event = new FormEvent($this->form, $data);`
`177`	`174`	`$listener = new ResizeFormListener('text', array(), false, false);`
`178`	`175`	`$listener->preSubmit($event);`
	`176`	`+`
	`177`	`+ $this->assertFalse($this->form->has('1'));`
`179`	`178`	`}`
`180`	`179`
`181`	`180`	`public function testPreSubmitDealsWithNullData()`