Symplify code

Author: nyamsprod

src/Domain.php

@@ -159,20 +159,14 @@ private function parseValue($domain): ?string
 
     private function domainToAscii(string $domain): string
     {
-        $option = IntlIdna::IDNA2008_ASCII_OPTIONS;
-        if (self::IDNA_2003 === $this->type) {
-            $option = IntlIdna::IDNA2003_ASCII_OPTIONS;
-        }
+        $option = self::IDNA_2003 === $this->type ? IntlIdna::IDNA2003_ASCII : IntlIdna::IDNA2008_ASCII;
 
         return IntlIdna::toAscii($domain, $option)->result();
     }
 
     private function domainToUnicode(string $domain): string
     {
-        $option = IntlIdna::IDNA2008_UNICODE_OPTIONS;
-        if (self::IDNA_2003 === $this->type) {
-            $option = IntlIdna::IDNA2003_UNICODE_OPTIONS;
-        }
+        $option = self::IDNA_2003 === $this->type ? IntlIdna::IDNA2003_UNICODE : IntlIdna::IDNA2008_UNICODE;
 
         return IntlIdna::toUnicode($domain, $option)->result();
     }

src/RootZoneDatabase.php

@@ -11,7 +11,7 @@
 use JsonSerializable;
 
 /**
- * @extends IteratorAggregate<EffectiveTopLevelDomain>
+ * @extends IteratorAggregate<string>
  */
 interface RootZoneDatabase extends Countable, DomainNameResolver, IteratorAggregate, JsonSerializable
 {
@@ -36,7 +36,7 @@ public function count(): int;
     public function isEmpty(): bool;
 
     /**
-     * @return Iterator<EffectiveTopLevelDomain>
+     * @return Iterator<string>
      */
     public function getIterator(): Iterator;
 

src/Rules.php

@@ -162,7 +162,7 @@ private static function addRule(array $list, array $ruleParts): array
         try {
             /** @var string $line */
             $line = array_pop($ruleParts);
-            $rule = IntlIdna::toAscii($line, IntlIdna::IDNA2008_ASCII_OPTIONS)->result();
+            $rule = IntlIdna::toAscii($line, IntlIdna::IDNA2008_ASCII)->result();
         } catch (CannotProcessHost $exception) {
             throw UnableToLoadPublicSuffixList::dueToInvalidRule($line ?? null, $exception);
         }

src/TopLevelDomains.php

@@ -166,7 +166,7 @@ private static function extractHeader(string $content): array
     private static function extractRootZone(string $content): string
     {
         try {
-            $tld = Suffix::fromIANA($content)->toAscii();
+            $tld = Suffix::fromIANA($content);
         } catch (CannotProcessHost $exception) {
             throw UnableToLoadRootZoneDatabase::dueToInvalidRootZoneDomain($content, $exception);
         }
@@ -221,12 +221,12 @@ public function isEmpty(): bool
     }
 
     /**
-     * @return Iterator<EffectiveTopLevelDomain>
+     * @return Iterator<string>
      */
     public function getIterator(): Iterator
     {
         foreach ($this->records as $tld) {
-            yield Suffix::fromIANA($tld)->toAscii();
+            yield $tld;
         }
     }
 
@@ -290,7 +290,7 @@ private function containsTopLevelDomain(DomainName $domain): bool
     {
         $label = $domain->toAscii()->label(0);
         foreach ($this as $tld) {
-            if ($tld->value() === $label) {
+            if ($tld === $label) {
                 return true;
             }
         }

src/TopLevelDomainsTest.php

@@ -191,9 +191,6 @@ public function testGetterProperties(): void
         );
         self::assertFalse($topLevelDomains->isEmpty());
         self::assertArrayHasKey('lastUpdated', $topLevelDomains->jsonSerialize());
-        foreach ($topLevelDomains as $tld) {
-            self::assertInstanceOf(Suffix::class, $tld);
-        }
     }
 
     /**