improve code

Author: nyamsprod

src/Domain.php

@@ -115,18 +115,22 @@ private function setPublicSuffix(PublicSuffix $publicSuffix): PublicSuffix
     /**
      * Normalize the domain name encoding content.
      *
-     * @param mixed $domain
+     * @param mixed $subject
      *
      * @return mixed
      */
-    private function normalize($domain)
+    private function normalize($subject)
     {
+        if (null === $this->domain || null === $subject->getContent()) {
+            return $subject;
+        }
+
         static $pattern = '/[^\x20-\x7f]/';
-        if (null !== $this->domain && preg_match($pattern, $this->domain)) {
-            return $domain->toUnicode();
+        if (!preg_match($pattern, $this->domain)) {
+            return $subject->toAscii();
         }
 
-        return $domain->toAscii();
+        return $subject->toUnicode();
     }
 
     /**
@@ -329,13 +333,17 @@ public function isPrivate(): bool
      */
     public function toAscii()
     {
-        static $pattern = '/[^\x20-\x7f]/';
-        if (null === $this->domain || !preg_match($pattern, $this->domain)) {
+        if (null === $this->domain) {
+            return $this;
+        }
+
+        $domain = $this->idnToAscii($this->domain);
+        if ($domain === $this->domain) {
             return $this;
         }
 
         $clone = clone $this;
-        $clone->domain = $this->idnToAscii($this->domain);
+        $clone->domain = $domain;
         $clone->labels = array_reverse(explode('.', $clone->domain));
         $clone->publicSuffix = $this->publicSuffix->toAscii();
         $clone->registrableDomain = $clone->setRegistrableDomain();

src/PublicSuffix.php

@@ -203,8 +203,12 @@ public function isPrivate(): bool
      */
     public function toAscii()
     {
-        static $pattern = '/[^\x20-\x7f]/';
-        if (null === $this->publicSuffix || !preg_match($pattern, $this->publicSuffix)) {
+        if (null === $this->publicSuffix) {
+            return $this;
+        }
+
+        $publicSuffix = $this->idnToAscii($this->publicSuffix);
+        if ($publicSuffix === $this->publicSuffix) {
             return $this;
         }
 

src/Rules.php

@@ -111,12 +111,7 @@ public function getPublicSuffix($domain = null, string $section = self::ALL_DOMA
             $publicSuffix = new PublicSuffix($domain->getLabel(0));
         }
 
-        static $pattern = '/[^\x20-\x7f]/';
-        if (preg_match($pattern, $domain->getContent())) {
-            return $publicSuffix->toUnicode();
-        }
-
-        return $publicSuffix;
+        return PublicSuffix::createFromDomain($domain->resolve($publicSuffix));
     }
 
     /**

tests/DomainTest.php

@@ -347,6 +347,7 @@ public function toAsciiProvider()
 
     /**
      * @covers ::resolve
+     * @covers ::normalize
      * @dataProvider resolvePassProvider
      *
      * @param Domain      $domain

tests/RulesTest.php

@@ -300,9 +300,10 @@ public function testWithDomainObject()
      */
     public function testWithDomainInterfaceObject()
     {
-        $publicSuffix = new PublicSuffix('ac.be', Rules::ICANN_DOMAINS);
-        $psl = $this->rules->getPublicSuffix($publicSuffix);
-        $this->assertEquals($publicSuffix, $psl);
+        $this->assertSame(
+            'ac.be',
+            $this->rules->getPublicSuffix(new PublicSuffix('ul.ac.be', Rules::ICANN_DOMAINS))->getContent()
+        );
     }
 
     /**