Merge pull request #338 from jeremykendall/develop

Prepare 6.1.2 releaase

Author: nyamsprod

.github/workflows/build.yaml

@@ -24,7 +24,5 @@ jobs:
             - run: composer phpunit
             - run: composer phpstan
               if: ${{ matrix.php == '8.1' }}
-            - run: composer psalm
-              if: ${{ matrix.php == '8.1' }}
             - run: composer phpcs
               if: ${{ matrix.php == '8.1' }}

.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],

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.2 - 2022-09-29
+
+### Added
+
+- None
+
+### Fixed
+
+- [#321](https://github.com/jeremykendall/php-domain-parser/issues/334) remove regression to resolving private domain suffix.
+
+### Deprecated
+
+- None
+
+### Removed
+
+- None
+
 ## 6.1.1 - 2022-02-18
 
 ### Added

composer.json

@@ -53,11 +53,9 @@
         "phpstan/phpstan-phpunit": "^1.0.0",
         "phpstan/phpstan-strict-rules": "^1.1.0",
         "phpunit/phpunit": "^9.5.13",
-        "psalm/plugin-phpunit": "^0.15.2",
         "psr/http-factory": "^1.0",
         "psr/simple-cache": "^1.0",
-        "symfony/cache": "^v5.0",
-        "vimeo/psalm": "^4.20"
+        "symfony/cache": "^v5.0 || ^v6.0"
     },
     "suggest": {
         "psr/http-client-implementation": "To use the storage functionnality which depends on PSR-18",
@@ -79,15 +77,13 @@
         "test": [
             "@phpunit",
             "@phpstan",
-            "@psalm",
-            "@phpcs"
+            "@phpcs:fix"
         ]
     },
     "scripts-descriptions": {
         "phpcs": "Runs coding style test suite",
         "phpcs:fix": "Fix the package coding style",
         "phpstan": "Runs complete codebase static analysis",
-        "psalm": "Runs complete codebase static analysis",
         "phpunit": "Runs unit and functional testing",
         "test": "Runs the complete test suite"
     },

psalm.xml

@@ -304,7 +304,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;
@@ -317,4 +318,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/Rules.php

@@ -611,4 +611,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/RulesTest.php

@@ -95,12 +95,11 @@ 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;
             }
 
             if (false === strpos($line, '#')) {
-                $data['records'] = $data['records'] ?? [];
                 $data['records'][self::extractRootZone($line)] = 1;
                 continue;
             }