[hotfix/ZF-11831] Zend_Form

Form's default translator incorrectly passed to subforms, causing override of subform elements' default translators
adamlundrigan · Oct 21, 2011 · 2558573 · 2558573
1 parent f4e41ab
commit 2558573
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 1 deletion.
diff --git a/library/Zend/Form/Form.php b/library/Zend/Form/Form.php
@@ -2248,7 +2248,8 @@ public function isValid($data)
             }
         }
         foreach ($this->getSubForms() as $key => $form) {
-            if (null !== $translator && !$form->hasTranslator()) {
+            if (null !== $translator && $this->hasTranslator()
+                    && !$form->hasTranslator()) {
                 $form->setTranslator($translator);
             }
             if (isset($data[$key]) && !$form->isArray()) {

diff --git a/tests/Zend/Form/FormTest.php b/tests/Zend/Form/FormTest.php
@@ -4237,4 +4237,59 @@ public function testAddDecoratorsKeepsNonNumericKeyNames()
         $t2 = $this->form->getDecorators();
         $this->assertEquals($t1, $t2);
     }
+
+    /**
+     * @group ZF-11831
+     */
+    public function testElementsOfSubFormReceiveCorrectDefaultTranslator()
+    {
+        // Global default translator
+        $trDefault = new \Zend\Translator\Translator(array(
+            'adapter' => 'arrayAdapter',
+            'content' => array(
+                \Zend\Validator\NotEmpty::IS_EMPTY => 'Default'
+            ),
+            'locale' => 'en'
+        ));
+        \Zend\Registry::set('Zend_Translate', $trDefault);
+
+        // Translator to use for elements
+        $trElement = new \Zend\Translator\Translator(array(
+            'adapter' => 'arrayAdapter',
+            'content' => array(
+                \Zend\Validator\NotEmpty::IS_EMPTY =>'Element'
+            ),
+            'locale' => 'en'
+        ));
+        \Zend\Validator\AbstractValidator::setDefaultTranslator($trElement);
+
+        // Change the form's translator
+        $form = new Form();
+        $form->addElement(new \Zend\Form\Element\Text('foo', array(
+            'required'   => true,
+            'validators' => array('NotEmpty')
+        )));
+
+        // Create a subform with it's own validator
+        $sf1 = new SubForm();
+        $sf1->addElement(new \Zend\Form\Element\Text('foosub', array(
+            'required'   => true,
+            'validators' => array('NotEmpty')
+        )));
+        $form->addSubForm($sf1, 'Test1');
+
+        $form->isValid(array());
+
+        $messages = $form->getMessages();
+        $this->assertEquals(
+            'Element', 
+            @$messages['foo'][\Zend\Validator\NotEmpty::IS_EMPTY], 
+            'Form element received wrong validator'
+        );
+        $this->assertEquals(
+            'Element', 
+            @$messages['Test1']['foosub'][\Zend\Validator\NotEmpty::IS_EMPTY], 
+            'SubForm element received wrong validator'
+        );        
+    }
 }