Merge branch 'hotfix/54'

Close #54

Author: weierophinney

CHANGELOG.md

@@ -27,6 +27,9 @@ All notable changes to this project will be documented in this file, in reverse
 - [#52](https://github.com/zendframework/zend-validator/pull/52) updates the
   `Barcode` validator to cast empty options passed to the constructor to an
   empty array, fixing type mismatch errors.
+- [#54](https://github.com/zendframework/zend-validator/pull/54) fixes the IP
+  address detection in the `Hostname` validator to ensure that IPv6 is detected
+  correctly.
 
 ## 2.5.3 - 2015-09-03
 

src/Hostname.php

@@ -1671,7 +1671,8 @@ public function isValid($value)
 
         $this->setValue($value);
         // Check input against IP address schema
-        if (preg_match('/^[0-9a-f:.]*$/i', $value)
+        if (((preg_match('/^[0-9.]*$/', $value) && strpos($value, '.') !== false)
+                || (preg_match('/^[0-9a-f:.]*$/i', $value) && strpos($value, ':') !== false))
             && $this->getIpValidator()->setTranslator($this->getTranslator())->isValid($value)
         ) {
             if (!($this->getAllow() & self::ALLOW_IP)) {

test/HostnameTest.php

@@ -527,4 +527,10 @@ public function testEqualsMessageVariables()
         $validator = $this->validator;
         $this->assertAttributeEquals($validator->getOption('messageVariables'), 'messageVariables', $validator);
     }
+
+    public function testHostnameWithOnlyIpChars()
+    {
+        $validator = new Hostname();
+        $this->assertTrue($validator->isValid('cafecafe.de'));
+    }
 }