Improve domain conversion

Author: nyamsprod

src/IDNAConverterTrait.php

@@ -71,7 +71,11 @@ private static function getIdnErrors(int $error_bit): string
      */
     private function idnToAscii(string $host): string
     {
-        if (false !== strpos($host, 'xn--')) {
+        if (false !== strpos($host, '%')) {
+            $host = rawurldecode($host);
+        }
+
+        if (!preg_match('/[\pL]+/u', $host)) {
             return $host;
         }
 
@@ -95,6 +99,10 @@ private function idnToAscii(string $host): string
      */
     private function idnToUnicode(string $host): string
     {
+        if (false !== strpos($host, '%')) {
+            $host = $this->idnToAscii($host);
+        }
+
         if (false === strpos($host, 'xn--')) {
             return $host;
         }

src/Rules.php

@@ -220,10 +220,6 @@ private function findPublicSuffix(string $domain, string $section): PublicSuffix
      */
     private function normalizeDomain(string $domain): string
     {
-        if (false !== strpos($domain, '%')) {
-            $domain = rawurldecode($domain);
-        }
-
         try {
             return strtolower($this->idnToAscii($domain));
         } catch (Exception $e) {

tests/PublicSuffixTest.php

@@ -18,6 +18,11 @@ public function testDomainInternalPhpMethod()
         $this->assertEquals($publicSuffix, $generatePublicSuffix);
     }
 
+    public function testPSToUnicodeWithUrlEncode()
+    {
+        $this->assertSame('bébe', (new PublicSuffix('b%C3%A9be'))->toUnicode()->getContent());
+    }
+
     public function testPSToAsciiThrowsException()
     {
         $this->expectException(Exception::class);