Merge branch '7.2' into 7.3

* 7.2:
  Silence E_DEPRECATED and E_USER_DEPRECATED
  [HttpCache] Hit the backend only once after waiting for the cache lock
  fix compatibility with Symfony 7.4
  [Form] Keep submitted values when keep_as_list option of collection type is enabled
  [Form] Fix `keep_as_list` when data is not an array

Author: nicolas-grekas

Extension/Core/EventListener/ResizeFormListener.php

@@ -199,17 +199,23 @@ 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);
             }
             foreach ($formReindex as $index => $child) {
                 $form->add($index, $this->type, array_replace([
                     'property_path' => '['.$index.']',
-                ], $this->options));
+                ], $this->options, ['data' => $child->getData()]));
+                $data[$index] = $child->getData();
             }
-            $data = array_values($data);
         }
 
         $event->setData($data);

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']);

Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php

@@ -257,7 +257,7 @@ public function testCollectionTypeKeepAsListOptionTrue()
     {
         $formMetadata = new ClassMetadata(Form::class);
         $authorMetadata = (new ClassMetadata(Author::class))
-            ->addPropertyConstraint('firstName', new NotBlank());
+            ->addPropertyConstraint('firstName', new Length(1));
         $organizationMetadata = (new ClassMetadata(Organization::class))
             ->addPropertyConstraint('authors', new Valid());
         $metadataFactory = $this->createMock(MetadataFactoryInterface::class);
@@ -301,22 +301,22 @@ public function testCollectionTypeKeepAsListOptionTrue()
         $form->submit([
             'authors' => [
                 0 => [
-                    'firstName' => '', // Fires a Not Blank Error
+                    'firstName' => 'foobar', // Fires a Length Error
                     'lastName' => 'lastName1',
                 ],
                 // key "1" could be missing if we add 4 blank form entries and then remove it.
                 2 => [
-                    'firstName' => '', // Fires a Not Blank Error
+                    'firstName' => 'barfoo', // Fires a Length Error
                     'lastName' => 'lastName3',
                 ],
                 3 => [
-                    'firstName' => '', // Fires a Not Blank Error
+                    'firstName' => 'barbaz', // Fires a Length Error
                     'lastName' => 'lastName3',
                 ],
             ],
         ]);
 
-        // Form does have 3 not blank errors
+        // Form does have 3 length errors
         $errors = $form->getErrors(true);
         $this->assertCount(3, $errors);
 
@@ -328,12 +328,15 @@ public function testCollectionTypeKeepAsListOptionTrue()
         ];
 
         $this->assertTrue($form->get('authors')->has('0'));
+        $this->assertSame('foobar', $form->get('authors')->get('0')->getData()->firstName);
         $this->assertContains('data.authors[0].firstName', $errorPaths);
 
         $this->assertTrue($form->get('authors')->has('1'));
+        $this->assertSame('barfoo', $form->get('authors')->get('1')->getData()->firstName);
         $this->assertContains('data.authors[1].firstName', $errorPaths);
 
         $this->assertTrue($form->get('authors')->has('2'));
+        $this->assertSame('barbaz', $form->get('authors')->get('2')->getData()->firstName);
         $this->assertContains('data.authors[2].firstName', $errorPaths);
 
         $this->assertFalse($form->get('authors')->has('3'));