symfony
diff --git a/‎src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
+7-1Lines changed: 7 additions & 1 deletion b/‎src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
+7-1Lines changed: 7 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
+14-1Lines changed: 14 additions & 1 deletion b/‎src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
+14-1Lines changed: 14 additions & 1 deletion
@@ -139,11 +139,17 @@ public function onSubmit(FormEvent $event)
         // The data mapper only adds, but does not remove items, so do this
         // here
         if ($this->allowDelete) {
+            $toDelete = array();
+
             foreach ($data as $name => $child) {
                 if (!$form->has($name)) {
-                    unset($data[$name]);
+                    $toDelete[] = $name;
                 }
             }
+
+            foreach ($toDelete as $name) {
+                unset($data[$name]);
+            }
         }
 
         $event->setData($data);
 
@@ -254,7 +254,20 @@ public function testOnSubmitNormDataDealsWithNullData()
         $this->assertEquals(array(), $event->getData());
     }
 
-    public function testOnSubmitDealsWithIteratorAggregate()
+    public function testOnSubmitDealsWithObjectBackedIteratorAggregate()
+    {
+        $this->form->add($this->getForm('1'));
+
+        $data = new \ArrayObject(array(0 => 'first', 1 => 'second', 2 => 'third'));
+        $event = new FormEvent($this->form, $data);
+        $listener = new ResizeFormListener('text', array(), false, true);
+        $listener->onSubmit($event);
+
+        $this->assertArrayNotHasKey(0, $event->getData());
+        $this->assertArrayNotHasKey(2, $event->getData());
+    }
+
+    public function testOnSubmitDealsWithArrayBackedIteratorAggregate()
     {
         $this->form->add($this->getForm('1'));
Original file line number	Diff line number	Diff line change
`@@ -139,11 +139,17 @@ public function onSubmit(FormEvent $event)`
`139`	`139`	`// The data mapper only adds, but does not remove items, so do this`
`140`	`140`	`// here`
`141`	`141`	`if ($this->allowDelete) {`
	`142`	`+ $toDelete = array();`
	`143`	`+`
`142`	`144`	`foreach ($data as $name => $child) {`
`143`	`145`	`if (!$form->has($name)) {`
`144`		`- unset($data[$name]);`
	`146`	`+ $toDelete[] = $name;`
`145`	`147`	`}`
`146`	`148`	`}`
	`149`	`+`
	`150`	`+ foreach ($toDelete as $name) {`
	`151`	`+ unset($data[$name]);`
	`152`	`+ }`
`147`	`153`	`}`
`148`	`154`
`149`	`155`	`$event->setData($data);`