Merge branch 'hotfix/20' into develop

Forward port #20
zendframework · Apr 7, 2016 · 8b53e9a · 8b53e9a
2 parents dd06523 + 8e309f9
commit 8b53e9a
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/src/View/Helper/FormRow.php b/src/View/Helper/FormRow.php
@@ -199,7 +199,7 @@ public function render(ElementInterface $element, $labelPosition = null)
                 ) {
                     $labelOpen = '';
                     $labelClose = '';
-                    $label = $labelHelper($element);
+                    $label = $labelHelper->openTag($element) . $label . $labelHelper->closeTag();
                 } else {
                     $labelOpen  = $labelHelper->openTag($labelAttributes);
                     $labelClose = $labelHelper->closeTag();

diff --git a/test/View/Helper/FormRowTest.php b/test/View/Helper/FormRowTest.php
@@ -10,6 +10,7 @@
 namespace ZendTest\Form\View\Helper;
 
 use PHPUnit_Framework_TestCase as TestCase;
+use Zend\I18n\Translator\TranslatorInterface;
 use Zend\Form\Element;
 use Zend\Form\Element\Captcha;
 use Zend\Form\View\HelperConfig;
@@ -248,6 +249,45 @@ public function testTranslatorMethods()
         $this->assertFalse($this->helper->isTranslatorEnabled());
     }
 
+    public function testLabelWillBeTranslatedOnceWithoutId()
+    {
+        $element = new Element('foo');
+        $element->setLabel('The value for foo:');
+
+        $mockTranslator = $this->getMock(TranslatorInterface::class);
+        $mockTranslator->expects($this->exactly(1))
+            ->method('translate')
+            ->will($this->returnValue('translated content'));
+
+        $this->helper->setTranslator($mockTranslator);
+        $this->assertTrue($this->helper->hasTranslator());
+
+        $markup = $this->helper->__invoke($element);
+        $this->assertContains('>translated content<', $markup);
+        $this->assertContains('<label', $markup);
+        $this->assertContains('</label>', $markup);
+    }
+
+    public function testLabelWillBeTranslatedOnceWithId()
+    {
+        $element = new Element('foo');
+        $element->setLabel('The value for foo:');
+        $element->setAttribute('id', 'foo');
+
+        $mockTranslator = $this->getMock(TranslatorInterface::class);
+        $mockTranslator->expects($this->exactly(1))
+            ->method('translate')
+            ->will($this->returnValue('translated content'));
+
+        $this->helper->setTranslator($mockTranslator);
+        $this->assertTrue($this->helper->hasTranslator());
+
+        $markup = $this->helper->__invoke($element);
+        $this->assertContains('>translated content<', $markup);
+        $this->assertContains('<label', $markup);
+        $this->assertContains('</label>', $markup);
+    }
+
     public function testSetLabelPositionInputNullRaisesException()
     {
         $this->setExpectedException('Zend\Form\Exception\InvalidArgumentException');