From 6c964e7131bf01876bf79c96c5b903668538b031 Mon Sep 17 00:00:00 2001
From: matlec <mathieu.lechat@sensiolabs.com>
Date: Mon, 2 Jun 2025 17:39:25 +0200
Subject: [PATCH] [Form] Fix `keep_as_list` when data is not an array

---
 .../Core/EventListener/ResizeFormListener.php     | 10 ++++++++--
 .../Core/EventListener/ResizeFormListenerTest.php | 15 ++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
index 299f919373403..a9e5213001cd6 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
@@ -199,7 +199,13 @@ public function onSubmit(FormEvent $event): void
         }
 
         if ($this->keepAsList) {
-            $formReindex = [];
+            $formReindex = $dataKeys = [];
+            foreach ($data as $key => $value) {
+                $dataKeys[] = $key;
+            }
+            foreach ($dataKeys as $key) {
+                unset($data[$key]);
+            }
             foreach ($form as $name => $child) {
                 $formReindex[] = $child;
                 $form->remove($name);
@@ -208,8 +214,8 @@ public function onSubmit(FormEvent $event): void
                 $form->add($index, $this->type, array_replace([
                     'property_path' => '['.$index.']',
                 ], $this->options));
+                $data[$index] = $child->getData();
             }
-            $data = array_values($data);
         }
 
         $event->setData($data);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
index 934460c8f98a4..390f6b04a60c5 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
@@ -310,7 +310,7 @@ public function testOnSubmitDealsWithObjectBackedIteratorAggregate()
         $this->assertArrayNotHasKey(2, $event->getData());
     }
 
-    public function testOnSubmitDealsWithArrayBackedIteratorAggregate()
+    public function testOnSubmitDealsWithDoctrineCollection()
     {
         $this->builder->add($this->getBuilder('1'));
 
@@ -323,6 +323,19 @@ public function testOnSubmitDealsWithArrayBackedIteratorAggregate()
         $this->assertArrayNotHasKey(2, $event->getData());
     }
 
+    public function testKeepAsListWorksWithTraversableArrayAccess()
+    {
+        $this->builder->add($this->getBuilder('1'));
+
+        $data = new \ArrayIterator([0 => 'first', 1 => 'second', 2 => 'third']);
+        $event = new FormEvent($this->builder->getForm(), $data);
+        $listener = new ResizeFormListener(TextType::class, keepAsList: true);
+        $listener->onSubmit($event);
+
+        $this->assertCount(1, $event->getData());
+        $this->assertArrayHasKey(0, $event->getData());
+    }
+
     public function testOnSubmitDeleteEmptyNotCompoundEntriesIfAllowDelete()
     {
         $this->builder->setData(['0' => 'first', '1' => 'second']);