bug #13851 [Form] [EventListener] fixed sending non array data on preSubmit to ResizeFormListener (BruceWouaigne)

webmozart · webmozart · commit 63c8ce9453e0 · 2015-06-18T16:15:52.000+02:00
This PR was submitted for the 2.7 branch but it was merged into the 2.8 branch instead (closes #13851). Discussion ---------- [Form] [EventListener] fixed sending non array data on preSubmit to ResizeFormListener | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #13804 | License | MIT | Doc PR | - Commits ------- 74d794b [Form] [EventListener] fixed sending non array data on submit to ResizeListener
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/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/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php b/src/Symfony/Component/Form/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
`@@ -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()`