Merge branch 'ZF-10690' of https://github.com/thomasweidner/zf2 into …

…hotfix/zf-10690
styxiak · Dec 17, 2010 · 104bfce · 104bfce
2 parents 35795b9 + 0bd34c6
commit 104bfce
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/library/Zend/Validator/EmailAddress.php b/library/Zend/Validator/EmailAddress.php
@@ -202,17 +202,17 @@ public function setOptions(array $options = array())
      */
     public function setMessage($messageString, $messageKey = null)
     {
-        $messageKeys = $messageKey;
         if ($messageKey === null) {
-            $keys = array_keys($this->_messageTemplates);
-            $messageKeys = current($keys);
+            $this->_options['hostname']->setMessage($messageString);
+            parent::setMessage($messageString);
+            return $this;
         }
 
-        if (!isset($this->_messageTemplates[$messageKeys])) {
+        if (!isset($this->_messageTemplates[$messageKey])) {
             $this->_options['hostname']->setMessage($messageString, $messageKey);
         }
 
-        $this->_messageTemplates[$messageKeys] = $messageString;
+        $this->_messageTemplates[$messageKey] = $messageString;
         return $this;
     }
 

diff --git a/tests/Zend/Validator/EmailAddressTest.php b/tests/Zend/Validator/EmailAddressTest.php
@@ -498,7 +498,7 @@ public function testSetSingleMessage()
     {
         $messages = $this->_validator->getMessageTemplates();
         $this->assertNotEquals('TestMessage', $messages[Validator\EmailAddress::INVALID]);
-        $this->_validator->setMessage('TestMessage');
+        $this->_validator->setMessage('TestMessage', Validator\EmailAddress::INVALID);
         $messages = $this->_validator->getMessageTemplates();
         $this->assertEquals('TestMessage', $messages[Validator\EmailAddress::INVALID]);
     }
@@ -531,6 +531,20 @@ public function testGetDeepMxCheck()
         $this->assertFalse($this->_validator->getDeepMxCheck());
     }
 
+    /**
+     * Testing setMessage for all messages
+     *
+     * @group ZF-10690
+     */
+    public function testSetMultipleMessages()
+    {
+        $messages = $this->_validator->getMessageTemplates();
+        $this->assertNotEquals('TestMessage', $messages[Validator\EmailAddress::INVALID]);
+        $this->_validator->setMessage('TestMessage');
+        $messages = $this->_validator->getMessageTemplates();
+        $this->assertEquals('TestMessage', $messages[Validator\EmailAddress::INVALID]);
+    }
+
     /**
      * Testing getDomainCheck
      */