From 03f51807a9c8d1919981d61a252a9133acfc5a16 Mon Sep 17 00:00:00 2001
From: Martin Keckeis <martin.keckeis1@gmail.com>
Date: Fri, 7 Mar 2014 13:07:44 +0100
Subject: [PATCH 1/3] Disable <label> for input hidden

---
 library/Zend/Form/View/Helper/FormRow.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/Zend/Form/View/Helper/FormRow.php b/library/Zend/Form/View/Helper/FormRow.php
index 83f366266cb..0df508013c8 100644
--- a/library/Zend/Form/View/Helper/FormRow.php
+++ b/library/Zend/Form/View/Helper/FormRow.php
@@ -158,7 +158,9 @@ public function render(ElementInterface $element)
 
         $elementString = $elementHelper->render($element);
 
-        if (isset($label) && '' !== $label) {
+        //hidden elements do not need a <label> -https://github.com/zendframework/zf2/issues/5607
+        $type = $element->getAttribute('type');
+        if (isset($label) && '' !== $label && $type !== 'hidden') {
             $label = $escapeHtmlHelper($label);
             $labelAttributes = $element->getLabelAttributes();
 
@@ -168,7 +170,6 @@ public function render(ElementInterface $element)
 
             // Multicheckbox elements have to be handled differently as the HTML standard does not allow nested
             // labels. The semantic way is to group them inside a fieldset
-            $type = $element->getAttribute('type');
             if ($type === 'multi_checkbox' || $type === 'radio') {
                 $markup = sprintf(
                     '<fieldset><legend>%s</legend>%s</fieldset>',

From 17696fc56c967af1dd5095ffbdb7f7467b38def4 Mon Sep 17 00:00:00 2001
From: Martin Keckeis <martin.keckeis1@gmail.com>
Date: Fri, 7 Mar 2014 13:11:16 +0100
Subject: [PATCH 2/3] Test for input hidden

---
 tests/ZendTest/Form/View/Helper/FormRowTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/ZendTest/Form/View/Helper/FormRowTest.php b/tests/ZendTest/Form/View/Helper/FormRowTest.php
index 3f72c19fe4e..77a1006c600 100644
--- a/tests/ZendTest/Form/View/Helper/FormRowTest.php
+++ b/tests/ZendTest/Form/View/Helper/FormRowTest.php
@@ -81,6 +81,14 @@ public function testCanCreateMarkupWithoutLabel()
         $markup = $this->helper->render($element);
         $this->assertRegexp('/<input name="foo" type="text"[^\/>]*\/?>/', $markup);
     }
+    
+    public function testIgnoreLabelForHidden()
+    {
+        $element = new Element\Hidden('foo');
+        $element->setLabel('My label');
+        $markup = $this->helper->render($element);
+        $this->assertRegexp('/<input name="foo" type="hidden"[^\/>]*\/?>/', $markup);
+    }
 
     public function testCanHandleMultiCheckboxesCorrectly()
     {

From 0865d2b90b89997cc9040146cae5143605e90da6 Mon Sep 17 00:00:00 2001
From: Martin Keckeis <martin.keckeis1@gmail.com>
Date: Fri, 7 Mar 2014 13:18:55 +0100
Subject: [PATCH 3/3] Fix travis

---
 tests/ZendTest/Form/View/Helper/FormRowTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/ZendTest/Form/View/Helper/FormRowTest.php b/tests/ZendTest/Form/View/Helper/FormRowTest.php
index 77a1006c600..43f1c1234cc 100644
--- a/tests/ZendTest/Form/View/Helper/FormRowTest.php
+++ b/tests/ZendTest/Form/View/Helper/FormRowTest.php
@@ -81,13 +81,13 @@ public function testCanCreateMarkupWithoutLabel()
         $markup = $this->helper->render($element);
         $this->assertRegexp('/<input name="foo" type="text"[^\/>]*\/?>/', $markup);
     }
-    
+
     public function testIgnoreLabelForHidden()
     {
         $element = new Element\Hidden('foo');
         $element->setLabel('My label');
         $markup = $this->helper->render($element);
-        $this->assertRegexp('/<input name="foo" type="hidden"[^\/>]*\/?>/', $markup);
+        $this->assertEquals('<input type="hidden" name="foo" value=""/>', $markup);
     }
 
     public function testCanHandleMultiCheckboxesCorrectly()