Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Fix Nested form element wrapping (relative: #4383) #4582

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion library/Zend/Form/Form.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -177,7 +177,9 @@ public function prepare()
$this->prepareElement($this); $this->prepareElement($this);
} else { } else {
foreach ($this->getIterator() as $elementOrFieldset) { foreach ($this->getIterator() as $elementOrFieldset) {
if ($elementOrFieldset instanceof ElementPrepareAwareInterface) { if ($elementOrFieldset instanceof FormInterface) {
$elementOrFieldset->prepare();
} elseif ($elementOrFieldset instanceof ElementPrepareAwareInterface) {
$elementOrFieldset->prepareElement($this); $elementOrFieldset->prepareElement($this);
} }
} }
Expand Down
15 changes: 15 additions & 0 deletions tests/ZendTest/Form/FormTest.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1519,4 +1519,19 @@ public function testAddRemove()
$this->form->remove('file_resource'); $this->form->remove('file_resource');
$this->assertEquals($form, $this->form); $this->assertEquals($form, $this->form);
} }

public function testNestedFormElementNameWrapping()
{
//build form
$rootForm = new Form;
$leafForm = new Form('form');
$element = new Element('element');
$leafForm->setWrapElements(true);
$leafForm->add($element);
$rootForm->add($leafForm);

//prepare for view
$rootForm->prepare();
$this->assertEquals('form[element]', $element->getName());
}
} }