Merge pull request #336 from jeremykendall/bugfix/private-domain-parsing

Improve bugfix for #321 and fixes #334

Author: nyamsprod

src/Rules.php

@@ -277,7 +277,8 @@ private function getPublicSuffixLengthFromSection(DomainName $domain, string $se
             if (!array_key_exists($label, $rules)) {
                 // for private domain suffix MUST be fully matched else no suffix is found
                 // https://github.com/jeremykendall/php-domain-parser/issues/321
-                if (self::PRIVATE_DOMAINS === $section && [] !== $rules) {
+                // https://github.com/jeremykendall/php-domain-parser/issues/334
+                if (self::PRIVATE_DOMAINS === $section && self::hasRemainingRuleLabels($rules)) {
                     $labelCount = 0;
                 }
                 break;
@@ -290,4 +291,15 @@ private function getPublicSuffixLengthFromSection(DomainName $domain, string $se
 
         return $labelCount;
     }
+
+    private static function hasRemainingRuleLabels(array $rules): bool
+    {
+        foreach ($rules as $rule) {
+            if ([] !== $rule) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }

src/RulesTest.php

@@ -590,4 +590,19 @@ public function testIssue321Failure(): void
 
         self::$rules->getPrivateDomain('clientportal.virtualcloud.com.br');
     }
+
+    public function testWithMultiLevelPrivateDomain(): void
+    {
+        $domain = self::$rules->resolve('test-domain.eu.org');
+
+        self::assertFalse($domain->suffix()->isICANN());
+        self::assertTrue($domain->suffix()->isPrivate());
+        self::assertSame('eu.org', $domain->suffix()->value());
+
+        $domain = self::$rules->resolve('test-domain.lt.eu.org');
+
+        self::assertFalse($domain->suffix()->isICANN());
+        self::assertTrue($domain->suffix()->isPrivate());
+        self::assertSame('lt.eu.org', $domain->suffix()->value());
+    }
 }