fix #234 resolve isTransitionalDifferent method

Author: Insolita

src/Domain.php

@@ -98,6 +98,7 @@ final class Domain implements DomainInterface, JsonSerializable
      * @var bool
     */
     private $isTransitionalDifferent;
+    
     /**
      * {@inheritdoc}
      */
@@ -127,6 +128,7 @@ public function __construct(
         $this->asciiIDNAOption = $asciiIDNAOption;
         $this->unicodeIDNAOption = $unicodeIDNAOption;
         $this->labels = $this->setLabels($domain, $asciiIDNAOption, $unicodeIDNAOption);
+        $this->isTransitionalDifferent = $this->hasTransitionalDifference($domain);
         if ([] !== $this->labels) {
             $this->domain = implode('.', array_reverse($this->labels));
         }
@@ -375,7 +377,7 @@ public function getPublicSuffix()
      */
     public function isResolvable(): bool
     {
-        return 1 < count($this->labels ?? []) && '.' !== substr($this->domain, -1, 1);
+        return 1 < count($this->labels) && '.' !== substr($this->domain, -1, 1);
     }
 
     /**
@@ -761,13 +763,6 @@ public function withIDNAOptions(int $forAscii, int $forUnicode)
      **/
     public function isTransitionalDifferent(): bool
     {
-        if ($this->isTransitionalDifferent === null) {
-            try {
-                $this->idnToAscii($this->getContent(), $this->asciiIDNAOption);
-            } catch (Throwable $e) {
-                $this->isTransitionalDifferent = false;
-            }
-        }
         return $this->isTransitionalDifferent;
     }
 }

src/IDNAConverterTrait.php

@@ -15,6 +15,7 @@
 
 namespace Pdp;
 
+use function is_string;
 use Pdp\Exception\InvalidDomain;
 use TypeError;
 use UnexpectedValueException;
@@ -115,7 +116,6 @@ private function idnToAscii(string $domain, int $IDNAOption = IDNA_DEFAULT): str
         $domain = rawurldecode($domain);
         static $pattern = '/[^\x20-\x7f]/';
         if (!preg_match($pattern, $domain)) {
-            $this->isTransitionalDifferent = false;
             return strtolower($domain);
         }
 
@@ -129,11 +129,7 @@ private function idnToAscii(string $domain, int $IDNAOption = IDNA_DEFAULT): str
             throw new UnexpectedValueException(sprintf('The Intl extension is misconfigured for %s, please correct this issue before proceeding.', PHP_OS));
         }
         // @codeCoverageIgnoreEnd
-    
-        if (property_exists($this, 'isTransitionalDifferent')) {
-            $this->isTransitionalDifferent = isset($arr['isTransitionalDifferent'])
-                                             && (bool)$arr['isTransitionalDifferent'] === true;
-        }
+        
         if (false === strpos($output, '%')) {
             return $output;
         }
@@ -234,4 +230,14 @@ private function setLabels($domain = null, int $asciiOption = 0, int $unicodeOpt
 
         return array_reverse(explode('.', $this->idnToUnicode($ascii_domain, $unicodeOption)));
     }
+    
+    private function hasTransitionalDifference($domain):bool
+    {
+        if(!is_string($domain) || empty($domain)){
+            return false;
+        }
+        $info = [];
+        idn_to_ascii($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46, $info);
+        return (bool)$info['isTransitionalDifferent'] === true;
+    }
 }

src/PublicSuffix.php

@@ -130,6 +130,7 @@ public function __construct(
         int $unicodeIDNAOption = IDNA_DEFAULT
     ) {
         $this->labels = $this->setLabels($publicSuffix, $asciiIDNAOption, $unicodeIDNAOption);
+        $this->isTransitionalDifferent = $this->hasTransitionalDifference($publicSuffix);
         $this->publicSuffix = $this->setPublicSuffix();
         $this->section = $this->setSection($section);
         $this->asciiIDNAOption = $asciiIDNAOption;
@@ -330,20 +331,14 @@ public function getUnicodeIDNAOption(): int
     {
         return $this->unicodeIDNAOption;
     }
+    
     /**
      * return true if domain contains deviation characters.
      * @see http://unicode.org/reports/tr46/#Transition_Considerations
      * @return bool
      **/
     public function isTransitionalDifferent(): bool
     {
-        if ($this->isTransitionalDifferent === null) {
-            try {
-                $this->idnToAscii($this->getContent());
-            } catch (Throwable $e) {
-                $this->isTransitionalDifferent = false;
-            }
-        }
         return $this->isTransitionalDifferent;
     }
 }

tests/DomainTest.php

@@ -15,6 +15,9 @@
 
 namespace Pdp\Tests;
 
+use function array_map;
+use function array_reduce;
+use function ord;
 use Pdp\Domain;
 use Pdp\Exception\CouldNotResolvePublicSuffix;
 use Pdp\Exception\CouldNotResolveSubDomain;
@@ -24,6 +27,8 @@
 use Pdp\PublicSuffix;
 use Pdp\Rules;
 use PHPUnit\Framework\TestCase;
+use function print_r;
+use function str_split;
 use TypeError;
 
 /**