Browse Source

[ZF-11239] Fixed not set Hostname validator (Backported fix from ZF2 PR #324)

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24660 44c647ce-9c0f-0410-b52a-842ac1e357ba
adamlundrigan 14 years ago
parent
commit
fd7be90ddb
2 changed files with 11 additions and 0 deletions
  1. 2 0
      library/Zend/Validate/EmailAddress.php
  2. 9 0
      tests/Zend/Validate/EmailAddressTest.php

+ 2 - 0
library/Zend/Validate/EmailAddress.php

@@ -177,6 +177,8 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
             } else {
                 $this->setHostnameValidator($options['hostname']);
             }
+        } elseif ($this->_options['hostname'] == null) {
+            $this->setHostnameValidator();
         }
 
         if (array_key_exists('mx', $options)) {

+ 9 - 0
tests/Zend/Validate/EmailAddressTest.php

@@ -561,6 +561,15 @@ class Zend_Validate_EmailAddressTest extends PHPUnit_Framework_TestCase
             $this->multipleOptionsDetected = true;
         }
     }
+    
+    /**
+     * @group ZF-11239
+     */
+    public function testNotSetHostnameValidator()
+    {
+        $hostname = $this->_validator->getHostnameValidator();
+        $this->assertTrue($hostname instanceof Zend_Validate_Hostname);
+    }
 }
 
 if (PHPUnit_MAIN_METHOD == 'Zend_Validate_EmailAddressTest::main') {