[Form] Added "collection_entry" block prefix to CollectionType entries

HeahDude · HeahDude · commit 400020bd4a9f · 2020-03-15T18:19:37.000+01:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
@@ -75,6 +75,12 @@ public function finishView(FormView $view, FormInterface $form, array $options)
         if ($form->getConfig()->hasAttribute('prototype') && $view->vars['prototype']->vars['multipart']) {
             $view->vars['multipart'] = true;
         }
+
+        $prefixOffset = isset($options['entry_options']['block_prefix']) ? -2 : -1;
+
+        foreach ($view as $entryView) {
+            array_splice($entryView->vars['block_prefixes'], $prefixOffset, 0, 'collection_entry');
+        }
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
@@ -404,6 +404,39 @@ public function testPrototypeNotOverrideRequiredByEntryOptionsInFavorOfParent()
         $this->assertFalse($child->createView()->vars['prototype']->vars['required'], '"Prototype" should not be required');
     }
 
+    public function testEntriesBlockPrefixes()
+    {
+        $collectionView = $this->factory->createNamed('fields', static::TESTED_TYPE, [''])
+            ->createView()
+        ;
+
+        $this->assertCount(1, $collectionView);
+        $this->assertSame([
+            'form',
+            'text',
+            'collection_entry',
+            '_fields_entry',
+        ], $collectionView[0]->vars['block_prefixes']);
+    }
+
+    public function testEntriesBlockPrefixesWithCustomBlockPrefix()
+    {
+        $collectionView = $this->factory->createNamed('fields', static::TESTED_TYPE, [''], [
+            'entry_options' => ['block_prefix' => 'field'],
+        ])
+            ->createView()
+        ;
+
+        $this->assertCount(1, $collectionView);
+        $this->assertSame([
+            'form',
+            'text',
+            'collection_entry',
+            'field',
+            '_fields_entry',
+        ], $collectionView[0]->vars['block_prefixes']);
+    }
+
     public function testSubmitNull($expected = null, $norm = null, $view = null)
     {
         parent::testSubmitNull([], [], []);

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,12 @@ public function finishView(FormView $view, FormInterface $form, array $options)`
`75`	`75`	`if ($form->getConfig()->hasAttribute('prototype') && $view->vars['prototype']->vars['multipart']) {`
`76`	`76`	`$view->vars['multipart'] = true;`
`77`	`77`	`}`
	`78`	`+`
	`79`	`+ $prefixOffset = isset($options['entry_options']['block_prefix']) ? -2 : -1;`
	`80`	`+`
	`81`	`+ foreach ($view as $entryView) {`
	`82`	`+ array_splice($entryView->vars['block_prefixes'], $prefixOffset, 0, 'collection_entry');`
	`83`	`+ }`
`78`	`84`	`}`
`79`	`85`
`80`	`86`	`/**`