prepare 1.0.3 release

bug fix idn_to_uf8 conversion error

CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All Notable changes to `League Uri Nostname parser` will be documented in this file
 
+## 1.0.3 - 2017-11-30
+
+### Added
+
+- None
+
+### Fixed
+
+- idn_to_utf8 public suffix conversion handle error cases
+
+### Deprecated
+
+- None
+
+### Removed
+
+- None
+
 ## 1.0.2 - 2017-11-23
 
 ### Added

src/PublicSuffix/Cache.php

@@ -6,7 +6,7 @@
  * @subpackage League\Uri\PublicSuffix
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @license    https://github.com/thephpleague/uri-hostname-parser/blob/master/LICENSE (MIT License)
- * @version    1.0.2
+ * @version    1.0.3
  * @link       https://github.com/thephpleague/uri-hostname-parser
  *
  * For the full copyright and license information, please view the LICENSE

src/PublicSuffix/CacheException.php

@@ -6,7 +6,7 @@
  * @subpackage League\Uri\PublicSuffix
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @license    https://github.com/thephpleague/uri-hostname-parser/blob/master/LICENSE (MIT License)
- * @version    1.0.2
+ * @version    1.0.3
  * @link       https://github.com/thephpleague/uri-hostname-parser
  *
  * For the full copyright and license information, please view the LICENSE

src/PublicSuffix/CurlHttpClient.php

@@ -6,7 +6,7 @@
  * @subpackage League\Uri\PublicSuffix
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @license    https://github.com/thephpleague/uri-hostname-parser/blob/master/LICENSE (MIT License)
- * @version    1.0.2
+ * @version    1.0.3
  * @link       https://github.com/thephpleague/uri-hostname-parser
  *
  * For the full copyright and license information, please view the LICENSE

src/PublicSuffix/Domain.php

@@ -6,7 +6,7 @@
  * @subpackage League\Uri\PublicSuffix
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @license    https://github.com/thephpleague/uri-hostname-parser/blob/master/LICENSE (MIT License)
- * @version    1.0.2
+ * @version    1.0.3
  * @link       https://github.com/thephpleague/uri-hostname-parser
  *
  * For the full copyright and license information, please view the LICENSE

src/PublicSuffix/Exception.php

@@ -6,7 +6,7 @@
  * @subpackage League\Uri\PublicSuffix
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @license    https://github.com/thephpleague/uri-hostname-parser/blob/master/LICENSE (MIT License)
- * @version    1.0.2
+ * @version    1.0.3
  * @link       https://github.com/thephpleague/uri-hostname-parser
  *
  * For the full copyright and license information, please view the LICENSE

src/PublicSuffix/HttpClient.php

@@ -6,7 +6,7 @@
  * @subpackage League\Uri\PublicSuffix
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @license    https://github.com/thephpleague/uri-hostname-parser/blob/master/LICENSE (MIT License)
- * @version    1.0.2
+ * @version    1.0.3
  * @link       https://github.com/thephpleague/uri-hostname-parser
  *
  * For the full copyright and license information, please view the LICENSE

src/PublicSuffix/HttpClientException.php

@@ -6,7 +6,7 @@
  * @subpackage League\Uri\PublicSuffix
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @license    https://github.com/thephpleague/uri-hostname-parser/blob/master/LICENSE (MIT License)
- * @version    1.0.2
+ * @version    1.0.3
  * @link       https://github.com/thephpleague/uri-hostname-parser
  *
  * For the full copyright and license information, please view the LICENSE

src/PublicSuffix/ICANNSectionManager.php

@@ -6,7 +6,7 @@
  * @subpackage League\Uri\PublicSuffix
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @license    https://github.com/thephpleague/uri-hostname-parser/blob/master/LICENSE (MIT License)
- * @version    1.0.2
+ * @version    1.0.3
  * @link       https://github.com/thephpleague/uri-hostname-parser
  *
  * For the full copyright and license information, please view the LICENSE

src/PublicSuffix/Rules.php

@@ -6,7 +6,7 @@
  * @subpackage League\Uri\PublicSuffix
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @license    https://github.com/thephpleague/uri-hostname-parser/blob/master/LICENSE (MIT License)
- * @version    1.0.2
+ * @version    1.0.3
  * @link       https://github.com/thephpleague/uri-hostname-parser
  *
  * For the full copyright and license information, please view the LICENSE
@@ -84,7 +84,16 @@ private function isMatchable($domain): bool
      */
     private function normalize(string $domain): string
     {
-        return strtolower(idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46));
+        if (false !== strpos($domain, '%')) {
+            $domain = rawurldecode($domain);
+        }
+
+        $normalize = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
+        if (false === $normalize) {
+            return '';
+        }
+
+        return strtolower($normalize);
     }
 
     /**
@@ -168,8 +177,12 @@ private function handleNoMatches(string $domain): Domain
     {
         $labels = explode('.', $domain);
         $publicSuffix = array_pop($labels);
-        if (null !== $publicSuffix && !$this->isPunycoded($domain)) {
+
+        if (!$this->isPunycoded($domain)) {
             $publicSuffix = idn_to_utf8($publicSuffix, 0, INTL_IDNA_VARIANT_UTS46);
+            if (false === $publicSuffix) {
+                $publicSuffix = null;
+            }
         }
 
         return new Domain($domain, $publicSuffix);

src/functions.php

@@ -6,7 +6,7 @@
  * @subpackage League\Uri\PublicSuffix
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @license    https://github.com/thephpleague/uri-hostname-parser/blob/master/LICENSE (MIT License)
- * @version    1.0.2
+ * @version    1.0.3
  * @link       https://github.com/thephpleague/uri-hostname-parser
  *
  * For the full copyright and license information, please view the LICENSE

tests/RulesTest.php

@@ -61,6 +61,15 @@ public function testSudDomainIsNull()
         $this->assertNull($domain->getSubDomain());
     }
 
+    public function testWithInvalidDomainName()
+    {
+        $domain = $this->rules->resolve('_b%C3%A9bé.be-');
+        $this->assertSame('_b%C3%A9bé.be-', $domain->getDomain());
+        $this->assertFalse($domain->isValid());
+        $this->assertNull($domain->getPublicSuffix());
+        $this->assertNull($domain->getRegistrableDomain());
+    }
+
     /**
      * @dataProvider parseDataProvider
      * @param mixed $publicSuffix