remove IDNA usage in TLD resolution

Author: nyamsprod

src/IDNAConverterTrait.php

@@ -104,15 +104,15 @@ private static function getIdnErrors(int $error_bit): string
      *
      * @param string $domain
      *
-     * @param int $IDNAOption
+     * @param int $option
      *
      * @throws InvalidDomain if the string can not be converted to ASCII using IDN UTS46 algorithm
      *
      * @return string
      */
-    private function idnToAscii(string $domain, int $IDNAOption = IDNA_DEFAULT): string
+    private function idnToAscii(string $domain, int $option = IDNA_DEFAULT): string
     {
-        list($domain, ) = $this->transformToAscii($domain, $IDNAOption);
+        list($domain, ) = $this->transformToAscii($domain, $option);
 
         return $domain;
     }
@@ -122,7 +122,6 @@ private function idnToAscii(string $domain, int $IDNAOption = IDNA_DEFAULT): str
      *
      * @param string $domain
      *
-     * @param int $IDNAOption
      * @param int $option
      *
      * @throws InvalidDomain if the string can not be converted to ASCII using IDN UTS46 algorithm
@@ -163,15 +162,16 @@ private function transformToAscii(string $domain, int $option): array
      *
      * @param string $domain
      *
-     * @param int $IDNAOption
+     * @param int $option
      *
-     * @throws InvalidDomain if the string can not be converted to UNICODE using IDN UTS46 algorithm
+     * @throws InvalidDomain            if the string can not be converted to UNICODE using IDN UTS46 algorithm
+     * @throws UnexpectedValueException if the intl extension is misconfigured
      *
      * @return string
      */
-    private function idnToUnicode(string $domain, int $IDNAOption = IDNA_DEFAULT): string
+    private function idnToUnicode(string $domain, int $option = IDNA_DEFAULT): string
     {
-        $output = idn_to_utf8($domain, $IDNAOption, INTL_IDNA_VARIANT_UTS46, $arr);
+        $output = idn_to_utf8($domain, $option, INTL_IDNA_VARIANT_UTS46, $arr);
         if (0 !== $arr['errors']) {
             throw new InvalidDomain(sprintf('The host `%s` is invalid : %s', $domain, self::getIdnErrors($arr['errors'])));
         }

src/Manager.php

@@ -206,7 +206,7 @@ public function refreshTLDs(
         static $converter;
 
         $converter = $converter ?? new TLDConverter();
-        $data = json_encode($converter->convert($this->http->getContent($url), $asciiIDNAOption, $unicodeIDNAOption));
+        $data = json_encode($converter->convert($this->http->getContent($url)));
 
         return $this->cache->set($this->getCacheKey('RZD', $url), $data, $this->filterTtl($ttl) ?? $this->ttl);
     }

src/Rules.php

@@ -87,6 +87,8 @@ public function __construct(
      * @param int           $asciiIDNAOption
      * @param int           $unicodeIDNAOption
      *
+     * @throws CouldNotLoadRules If the rules can not be loaded from the path
+     *
      * @return self
      */
     public static function createFromPath(

src/TLDConverter.php

@@ -18,13 +18,11 @@
 use DateTimeImmutable;
 use Pdp\Exception\CouldNotLoadTLDs;
 use SplTempFileObject;
-use function compact;
 use function preg_match;
 use function sprintf;
 use function strpos;
 use function trim;
 use const DATE_ATOM;
-use const IDNA_DEFAULT;
 
 /**
  * IANA Root Zone Database Parser.
@@ -44,24 +42,21 @@ final class TLDConverter
      * Converts the IANA Root Zone Database into a TopLevelDomains associative array.
      *
      * @param string $content
-     * @param int    $asciiIDNAOption
-     * @param int    $unicodeIDNAOption
+     *
+     * @throws CouldNotLoadTLDs if the content is invalid or can not be correctly parsed and converted
      *
      * @return array
      */
-    public function convert(
-        string $content,
-        int $asciiIDNAOption = IDNA_DEFAULT,
-        int $unicodeIDNAOption = IDNA_DEFAULT
-    ): array {
+    public function convert(string $content): array
+    {
         $data = [];
         $file = new SplTempFileObject();
         $file->fwrite($content);
         $file->setFlags(SplTempFileObject::DROP_NEW_LINE | SplTempFileObject::READ_AHEAD | SplTempFileObject::SKIP_EMPTY);
         foreach ($file as $line) {
             $line = trim($line);
             if ([] === $data) {
-                $data = array_merge($this->extractHeader($line), compact('asciiIDNAOption', 'unicodeIDNAOption'));
+                $data = $this->extractHeader($line);
                 continue;
             }
 
@@ -75,7 +70,7 @@ public function convert(
         }
 
         if (isset($data['version'], $data['modifiedDate'], $data['records'])) {
-            return array_merge($data, compact('asciiIDNAOption', 'unicodeIDNAOption'));
+            return $data;
         }
 
         throw new CouldNotLoadTLDs(sprintf('Invalid content: TLD conversion failed'));
@@ -116,8 +111,8 @@ private function extractRootZone(string $content): string
     {
         try {
             $tld = (new PublicSuffix($content))->toAscii();
-        } catch (Exception $e) {
-            throw new CouldNotLoadTLDs(sprintf('Invalid Root zone: %s', $content), 0, $e);
+        } catch (Exception $exception) {
+            throw new CouldNotLoadTLDs(sprintf('Invalid Root zone: %s', $content), 0, $exception);
         }
 
         if (1 !== $tld->count() || '' === $tld->getContent()) {

src/TopLevelDomains.php

@@ -90,6 +90,8 @@ public function __construct(
      * @param int           $asciiIDNAOption
      * @param int           $unicodeIDNAOption
      *
+     * @throws CouldNotLoadTLDs If the rules can not be loaded from the path
+     *
      * @return self
      */
     public static function createFromPath(
@@ -131,14 +133,14 @@ public static function createFromString(
 
         $converter = $converter ?? new TLDConverter();
 
-        $data = $converter->convert($content, $asciiIDNAOption, $unicodeIDNAOption);
+        $data = $converter->convert($content);
 
         return new self(
             $data['records'],
             $data['version'],
             DateTimeImmutable::createFromFormat(DATE_ATOM, $data['modifiedDate']),
-            $data['asciiIDNAOption'],
-            $data['unicodeIDNAOption']
+            $asciiIDNAOption,
+            $unicodeIDNAOption
         );
     }
 
@@ -228,9 +230,12 @@ public function isEmpty(): bool
     public function getIterator()
     {
         foreach ($this->records as $tld) {
-            $publicSuffix = new PublicSuffix($tld, PublicSuffix::ICANN_DOMAINS, $this->asciiIDNAOption, $this->unicodeIDNAOption);
-            
-            yield $publicSuffix->toAscii();
+            yield (new PublicSuffix(
+                $tld,
+                PublicSuffix::ICANN_DOMAINS,
+                $this->asciiIDNAOption,
+                $this->unicodeIDNAOption
+            ))->toAscii();
         }
     }
 
@@ -245,8 +250,6 @@ public function toArray(): array
             'version' => $this->version,
             'records' => $this->records,
             'modifiedDate' => $this->modifiedDate->format(DATE_ATOM),
-            'asciiIDNAOption'=>$this->asciiIDNAOption,
-            'unicodeIDNAOption'=>$this->unicodeIDNAOption,
         ];
     }