[#321] bugfix suffix resolution for private domain

Author: nyamsprod

.github/workflows/build.yaml

@@ -23,8 +23,8 @@ jobs:
             - run: composer update --no-progress ${{ matrix.composer-flags }}
             - run: composer phpunit
             - run: composer phpstan
-              if: ${{ matrix.php == '8.0' }}
+              if: ${{ matrix.php == '8.1' }}
             - run: composer psalm
-              if: ${{ matrix.php == '8.0' }}
+              if: ${{ matrix.php == '8.1' }}
             - run: composer phpcs
-              if: ${{ matrix.php == '8.0' }}
+              if: ${{ matrix.php == '8.1' }}

CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All Notable changes to `PHP Domain Parser` starting from the **5.x** series will be documented in this file
 
+## 6.1.1 - 2022-02-18
+
+### Added
+
+- None
+
+### Fixed
+
+- [#321](https://github.com/jeremykendall/php-domain-parser/issues/321) improve resolving private domain suffix
+
+### Deprecated
+
+- None
+
+### Removed
+
+- None
+
 ## 6.1.0 - 2021-06-19
 
 ### Added

composer.json

@@ -46,7 +46,7 @@
         "ext-json": "*"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.19||^3.0",
+        "friendsofphp/php-cs-fixer": "^2.19||~v3.4.0",
         "guzzlehttp/guzzle": "^7.0",
         "guzzlehttp/psr7": "^1.6||^2.0",
         "phpstan/phpstan": "^0.12.89",

src/Rules.php

@@ -302,6 +302,11 @@ private function getPublicSuffixLengthFromSection(DomainName $domain, string $se
 
             //no match found
             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) {
+                    $labelCount = 0;
+                }
                 break;
             }
 

src/RulesTest.php

@@ -593,4 +593,15 @@ public function effectiveTLDProvider(): iterable
             ],
         ];
     }
+
+    public function testIssue321(): void
+    {
+        $result = self::$rules->resolve('node857-gelofesta.users.scale.virtualcloud.com.br');
+        self::assertSame('users.scale.virtualcloud.com.br', $result->suffix()->value());
+        self::assertTrue($result->suffix()->isPrivate());
+
+        $result = self::$rules->resolve('clientportal.virtualcloud.com.br');
+        self::assertSame('com.br', $result->suffix()->value());
+        self::assertTrue($result->suffix()->isICANN());
+    }
 }