Merge branch 'hotfix/3272'

Close zendframework/zendframework#3272
zendframework · Jan 3, 2013 · 929dd5e · 929dd5e
commit 929dd5e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/Hostname.php b/src/Hostname.php
@@ -184,6 +184,7 @@ class Hostname extends AbstractValidator
             8 => '/^[\x{002d}0-9a-záéíñóúü]{1,63}$/iu'),
         'IO'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿăąāćĉčċďđĕěėęēğĝġģĥħĭĩįīıĵķĺľļłńňņŋŏőōœĸŕřŗśŝšşťţŧŭůűũųūŵŷźžż]{1,63}$/iu'),
         'IS'  => array(1 => '/^[\x{002d}0-9a-záéýúíóþæöð]{1,63}$/iu'),
+        'IT'  => array(1 => '/^[\x{002d}0-9a-zàâäèéêëìîïòôöùûüæœçÿß-]{1,63}$/iu'),
         'JP'  => 'Hostname/Jp.php',
         'KR'  => array(1 => '/^[\x{AC00}-\x{D7A3}]{1,17}$/iu'),
         'LI'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿœ]{1,63}$/iu'),

diff --git a/test/HostnameTest.php b/test/HostnameTest.php
@@ -450,6 +450,16 @@ public function testIDNSI()
         $this->assertFalse($validator->isValid('رات.si'));
     }
 
+    public function testIDNIT()
+    {
+        $validator = new Hostname(Hostname::ALLOW_ALL);
+
+        $this->assertTrue($validator->isValid('plainascii.it'));
+        $this->assertTrue($validator->isValid('città-caffè.it'));
+        $this->assertTrue($validator->isValid('edgetest-àâäèéêëìîïòôöùûüæœçÿß.it'));
+        $this->assertFalse($validator->isValid('رات.it'));
+    }
+
     public function testEqualsMessageTemplates()
     {
         $validator = $this->validator;