Merge branch '2.6' into 2.7

Tobion · Tobion · commit 550b25b5f0e5 · 2015-06-27T22:17:00.000+02:00
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
@@ -359,7 +359,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]"]
     ]
@@ -383,7 +383,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]"]
     ]
@@ -457,7 +457,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]"]
     ]
@@ -1278,17 +1278,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
@@ -635,7 +635,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]"]
     ]
@@ -658,7 +658,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]"]
     ]
@@ -735,7 +735,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]"]
     ]
@@ -1442,15 +1442,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
`@@ -635,7 +635,7 @@ public function testSingleChoiceNonRequired()`
`635`	`635`	`[@name="name"]`
`636`	`636`	`[not(@required)]`
`637`	`637`	`[`
`638`		`- ./option[@value=""][.="[trans][/trans]"]`
	`638`	`+ ./option[@value=""][.=""]`
`639`	`639`	`/following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]`
`640`	`640`	`/following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]`
`641`	`641`	`]`
`@@ -658,7 +658,7 @@ public function testSingleChoiceNonRequiredNoneSelected()`
`658`	`658`	`[@name="name"]`
`659`	`659`	`[not(@required)]`
`660`	`660`	`[`
`661`		`- ./option[@value=""][.="[trans][/trans]"]`
	`661`	`+ ./option[@value=""][.=""]`
`662`	`662`	`/following-sibling::option[@value="&a"][not(@selected)][.="[trans]Choice&A[/trans]"]`
`663`	`663`	`/following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]`
`664`	`664`	`]`
`@@ -735,7 +735,7 @@ public function testSingleChoiceRequiredWithPlaceholderViaView()`
`735`	`735`	`[@name="name"]`
`736`	`736`	`[@required="required"]`
`737`	`737`	`[`
`738`		`- ./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]`
	`738`	`+ ./option[@value=""][not(@selected)][not(@disabled)][.=""]`
`739`	`739`	`/following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]`
`740`	`740`	`/following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]`
`741`	`741`	`]`
`@@ -1442,15 +1442,15 @@ public function testBirthDayWithPlaceholder()`
`1442`	`1442`	`[`
`1443`	`1443`	`./select`
`1444`	`1444`	`[@id="name_month"]`
`1445`		`- [./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]]`
	`1445`	`+ [./option[@value=""][not(@selected)][not(@disabled)][.=""]]`
`1446`	`1446`	`[./option[@value="1"][@selected="selected"]]`
`1447`	`1447`	`/following-sibling::select`
`1448`	`1448`	`[@id="name_day"]`
`1449`		`- [./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]]`
	`1449`	`+ [./option[@value=""][not(@selected)][not(@disabled)][.=""]]`
`1450`	`1450`	`[./option[@value="1"][@selected="selected"]]`
`1451`	`1451`	`/following-sibling::select`
`1452`	`1452`	`[@id="name_year"]`
`1453`		`- [./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]]`
	`1453`	`+ [./option[@value=""][not(@selected)][not(@disabled)][.=""]]`
`1454`	`1454`	`[./option[@value="1950"][@selected="selected"]]`
`1455`	`1455`	`]`
`1456`	`1456`	`[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()`