Improve bugfix for #321 and fixes #334

Author: nyamsprod

.php-cs-fixer.php

@@ -27,7 +27,7 @@
             'remove_inheritdoc' => true,
             'allow_unused_params' => false,
         ],
-        'no_trailing_comma_in_singleline_array' => true,
+        'no_trailing_comma_in_singleline' => true,
         'no_unused_imports' => true,
         'ordered_imports' => ['imports_order' => ['class', 'function', 'const'], 'sort_algorithm' => 'alpha'],
         'phpdoc_add_missing_param_annotation' => ['only_untyped' => true],

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 && [] !== $rules && [] !== reset($rules)) {
                     $labelCount = 0;
                 }
                 break;

src/RulesTest.php

@@ -603,4 +603,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());
+    }
 }

src/TopLevelDomains.php

@@ -11,7 +11,6 @@
 use function count;
 use function in_array;
 use function preg_match;
-use function strpos;
 use function trim;
 
 final class TopLevelDomains implements TopLevelDomainList
@@ -71,11 +70,10 @@ public static function parse(string $content): array
         foreach ($file as $line) {
             $line = trim($line);
             if ([] === $data) {
-                $data = self::extractHeader($line);
+                $data = self::extractHeader($line) + ['records' => []];
                 continue;
             }
 
-            $data['records'] = $data['records'] ?? [];
             if (!str_contains($line, '#')) {
                 $data['records'][self::extractRootZone($line)] = 1;
                 continue;