Fixation form collection helper lost second argument

Added second argument to helper call Added unit test for fixation
padraic · Feb 2, 2015 · fb29987 · fb29987
1 parent 49f3986
commit fb29987
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/library/Zend/Form/View/Helper/FormCollection.php b/library/Zend/Form/View/Helper/FormCollection.php
@@ -113,7 +113,7 @@ public function render(ElementInterface $element)
 
         foreach ($element->getIterator() as $elementOrFieldset) {
             if ($elementOrFieldset instanceof FieldsetInterface) {
-                $markup .= $fieldsetHelper($elementOrFieldset);
+                $markup .= $fieldsetHelper($elementOrFieldset, $this->shouldWrap());
             } elseif ($elementOrFieldset instanceof ElementInterface) {
                 $markup .= $elementHelper($elementOrFieldset);
             }
@@ -178,7 +178,7 @@ public function renderTemplate(CollectionElement $collection)
         $elementOrFieldset = $collection->getTemplateElement();
 
         if ($elementOrFieldset instanceof FieldsetInterface) {
-            $templateMarkup .= $fieldsetHelper($elementOrFieldset);
+            $templateMarkup .= $fieldsetHelper($elementOrFieldset, $this->shouldWrap());
         } elseif ($elementOrFieldset instanceof ElementInterface) {
             $templateMarkup .= $elementHelper($elementOrFieldset);
         }

diff --git a/tests/ZendTest/Form/View/Helper/FormCollectionTest.php b/tests/ZendTest/Form/View/Helper/FormCollectionTest.php
@@ -122,6 +122,26 @@ public function testRenderWithCustomFieldsetHelper()
         $this->assertContains('id="customFieldsetfieldsets"', $markup);
     }
 
+    public function testShouldNotWrapAtSubInvokeHelper()
+    {
+        $form = $this->getForm();
+
+        $fact = $this->helper->__invoke($form, false);
+
+
+        $this->assertNotContains('<fieldset', $fact);
+    }
+
+    public function testShouldWrapAtRecursiveHelperCall()
+    {
+        $form = $this->getForm();
+
+        $fact = $this->helper->__invoke($form);
+
+
+        $this->assertContains('<f ieldset', $fact);
+    }
+
     public function testShouldWrapReturnsDefaultTrue()
     {
         $this->assertTrue($this->helper->shouldWrap());