Improve package

- Simplify PublicSuffix section validation
- Simplify Rules section validation
- Improve Domain internal code

Author: nyamsprod

src/Domain.php

@@ -123,7 +123,7 @@ private function setPublicSuffix(PublicSuffix $publicSuffix): PublicSuffix
      *
      * @return PublicSuffix
      */
-    private function normalize($subject)
+    private function normalize(PublicSuffix $subject): PublicSuffix
     {
         if (null === $this->domain || null === $subject->getContent()) {
             return $subject;
@@ -323,8 +323,7 @@ public function getPublicSuffix()
      */
     public function isResolvable(): bool
     {
-        return 2 <= count($this->labels)
-            && '.' !== substr($this->domain, -1, 1);
+        return 1 < count($this->labels) && '.' !== substr($this->domain, -1, 1);
     }
 
     /**

src/PublicSuffix.php

@@ -66,15 +66,14 @@ public static function __set_state(array $properties): self
      */
     public static function createFromDomain(Domain $domain): self
     {
-        if (!$domain->isKnown()) {
-            return new self($domain->getPublicSuffix());
-        }
-
+        $section = '';
         if ($domain->isICANN()) {
-            return new self($domain->getPublicSuffix(), self::ICANN_DOMAINS);
+            $section = self::ICANN_DOMAINS;
+        } elseif ($domain->isPrivate()) {
+            $section = self::PRIVATE_DOMAINS;
         }
 
-        return new self($domain->getPublicSuffix(), self::PRIVATE_DOMAINS);
+        return new self($domain->getPublicSuffix(), $section);
     }
 
     /**

src/Rules.php

@@ -152,12 +152,12 @@ public function resolve($domain, string $section = self::ALL_DOMAINS): Domain
      */
     private function validateSection(string $section): string
     {
-        if (self::ALL_DOMAINS === $section || '' === $section) {
-            return '';
+        if (self::ALL_DOMAINS === $section) {
+            $section = '';
         }
 
-        $rules = $this->rules[$section] ?? null;
-        if (is_array($rules)) {
+        static $section_list = [self::PRIVATE_DOMAINS, self::ICANN_DOMAINS, ''];
+        if (in_array($section, $section_list, true)) {
             return $section;
         }
 
@@ -202,7 +202,7 @@ private function findPublicSuffix(DomainInterface $domain, string $section): Pub
      */
     private function findPublicSuffixFromSection(DomainInterface $domain, string $section): PublicSuffix
     {
-        $rules = $this->rules[$section];
+        $rules = $this->rules[$section] ?? [];
         $matches = [];
         foreach ($domain as $label) {
             //match exception rule

tests/PublicSuffixTest.php

@@ -151,7 +151,7 @@ public function testToUnicodeThrowsException()
      * @covers ::idnToAscii
      * @covers ::idnToUnicode
      *
-     * @dataProvider testConversionReturnsTheSameInstanceProvider
+     * @dataProvider conversionReturnsTheSameInstanceProvider
      *
      * @param string|null $publicSuffix
      */
@@ -162,7 +162,7 @@ public function testConversionReturnsTheSameInstance($publicSuffix)
         $this->assertSame($instance->toAscii(), $instance);
     }
 
-    public function testConversionReturnsTheSameInstanceProvider()
+    public function conversionReturnsTheSameInstanceProvider()
     {
         return [
             'ascii only domain' => ['ac.be'],