Update IDN algorithms

thephpleague · Feb 6, 2017 · 84a5c0a · 84a5c0a
1 parent 5bf5db0
commit 84a5c0a
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 All Notable changes to `League\Uri\Components` will be documented in this file
 
+## 1.0.1 - 2017-02-06
+
+### Added
+
+- None
+
+### Fixed
+
+- Update idn to ascii algorithm from INTL_IDNA_VARIANT_2003 to  INTL_IDNA_VARIANT_UTS46
+
+### Deprecated
+
+- None
+
+### Remove
+
+- None
+
 ## 1.0.0 - 2017-01-17
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^1.0",
-        "phpunit/phpunit" : "^5.0"
+        "phpunit/phpunit" : "^6.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Host.php b/src/Host.php
@@ -233,7 +233,7 @@ protected function validate(string $host = null): array
         }
 
         if ($this->isValidHostname($host)) {
-            return array_reverse(array_map('idn_to_utf8', explode('.', strtolower($host))));
+            return array_reverse(array_map([$this, 'toIdn'], explode('.', strtolower($host))));
         }
 
         throw new Exception(sprintf('The submitted host `%s` is invalid', $host));
@@ -341,7 +341,7 @@ public function keys(...$args): array
             return array_keys($this->data);
         }
 
-        return array_keys($this->data, idn_to_utf8($this->validateString($args[0])), true);
+        return array_keys($this->data, $this->toIdn($this->validateString($args[0])), true);
     }
 
     /**
@@ -374,7 +374,7 @@ public function getContent(int $enc_type = ComponentInterface::RFC3986_ENCODING)
         }
 
         if ($enc_type != ComponentInterface::RFC3987_ENCODING) {
-            return $this->format(array_map('idn_to_ascii', $this->data), $this->is_absolute);
+            return $this->format(array_map([$this, 'toAscii'], $this->data), $this->is_absolute);
         }
 
         return $this->format($this->data, $this->is_absolute);

diff --git a/src/HostInfoTrait.php b/src/HostInfoTrait.php
@@ -221,11 +221,42 @@ protected function isValidIpv6Hostname(string $ipv6): bool
      */
     protected function isValidHostname(string $host): bool
     {
-        $labels = array_map('idn_to_ascii', explode('.', $host));
+        $labels = array_map([$this, 'toAscii'], explode('.', $host));
 
         return 127 > count($labels) && $labels === array_filter($labels, [$this, 'isValidLabel']);
     }
 
+    /**
+     * Convert domain name to IDNA ASCII form.
+     *
+     * @param string $label
+     *
+     * @return string
+     */
+    protected function toAscii(string $label)
+    {
+        $res = idn_to_ascii($label, 0, INTL_IDNA_VARIANT_UTS46);
+        if (false !== $res) {
+            return $res;
+        }
+
+        return '';
+    }
+
+
+    /**
+     * Convert domain name to IDNA ASCII form.
+     *
+     * @param string $label
+     *
+     * @return string
+     */
+    protected function toIdn(string $label)
+    {
+        return idn_to_utf8($label, 0, INTL_IDNA_VARIANT_UTS46);
+    }
+
+
     /**
      * Returns whether the host label is valid
      *