Merge pull request #350 from jeremykendall/develop

Prepare next release
jeremykendall · Feb 25, 2023 · 34c7177 · 34c7177
2 parents a9e0b23 + df277d6
commit 34c7177
Show file tree

Hide file tree

Showing 26 changed files with 685 additions and 527 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -10,16 +10,11 @@ jobs:
         runs-on: ubuntu-20.04
         strategy:
             matrix:
-                php: ['8.1']
+                php: ['8.1', '8.2']
                 stability: [prefer-lowest, prefer-stable]
-                include:
-                    -   php: '8.2'
-                        flags: "--ignore-platform-req=php"
-                        phpunit-flags: '--no-coverage'
-                        stability: prefer-stable
         steps:
             - name: Checkout code
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
@@ -36,8 +31,8 @@ jobs:
             - name: Get Composer Cache Directory
               id: composer-cache
               run: |
-                  echo "::set-output name=dir::$(composer config cache-files-dir)"
-            - uses: actions/cache@v2
+                  echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+            - uses: actions/cache@v3
               with:
                   path: ${{ steps.composer-cache.outputs.dir }}
                   key: ${{ runner.os }}-composer-${{ matrix.stability }}-${{ matrix.flags }}-${{ hashFiles('**/composer.lock') }}
@@ -53,7 +48,7 @@ jobs:
 
             - name: Run static analysis
               run: composer phpstan
-              if: ${{ matrix.php == '8.1' && matrix.stability == 'prefer-stable'}}
+              if: ${{ matrix.php == '8.2' && matrix.stability == 'prefer-stable'}}
 
             - name: Run Coding style rules
               run: composer phpcs:fix

diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@ docs
 build
 pdp
 .idea
+.phpunit.cache
 .php_cs.cache
 .php-cs-fixer.cache
-.phpunit.result.cache
 composer.lock
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,27 @@
 
 All Notable changes to `PHP Domain Parser` starting from the **5.x** series will be documented in this file
 
-## 6.2.0 - 2022-10-30
+## [6.3.0] - 2023-02-25
+
+### Added
+
+- `RegisteredName` class to allow domain with IP4-like labels
+
+### Fixed
+
+- Using PHPUnit 10
+- `Domain` decorates the new `RegisteredName` class [#347](https://github.com/jeremykendall/php-domain-parser/issues/347)
+- `Host::withoutLabel` works without arguments.
+
+### Deprecated
+
+- None
+
+### Removed
+
+- None
+
+## [6.2.0] - 2022-10-30
 
 ### Added
 
@@ -20,7 +40,7 @@ All Notable changes to `PHP Domain Parser` starting from the **5.x** series will
 
 - PHP7 and PHP8.0 support
 
-## 6.1.2 - 2022-09-29
+## [6.1.2] - 2022-09-29
 
 ### Added
 
@@ -38,7 +58,7 @@ All Notable changes to `PHP Domain Parser` starting from the **5.x** series will
 
 - None
 
-## 6.1.1 - 2022-02-18
+## [6.1.1] - 2022-02-18
 
 ### Added
 
@@ -56,7 +76,7 @@ All Notable changes to `PHP Domain Parser` starting from the **5.x** series will
 
 - None
 
-## 6.1.0 - 2021-06-19
+## [6.1.0] - 2021-06-19
 
 ### Added
 
@@ -79,7 +99,7 @@ All Notable changes to `PHP Domain Parser` starting from the **5.x** series will
 
 - None
 
-## 6.0.0 - 2020-12-13
+## [6.0.0] - 2020-12-13
 
 ### Added
 
@@ -130,7 +150,7 @@ All Notable changes to `PHP Domain Parser` starting from the **5.x** series will
 - `Pdp\TopLevelDomains::contains` without replacement
 - Internal Converter classes (implementation details are no longer exposed).
 
-## 5.7.2 - 2020-10-25
+## [5.7.2] - 2020-10-25
 
 ### Added
 
@@ -148,7 +168,7 @@ All Notable changes to `PHP Domain Parser` starting from the **5.x** series will
 
 - None
 
-## 5.7.1 - 2020-08-24
+## [5.7.1] - 2020-08-24
 
 ### Added
 
@@ -166,7 +186,7 @@ All Notable changes to `PHP Domain Parser` starting from the **5.x** series will
 
 - None
 
-## 5.7.0 - 2020-08-02
+## [5.7.0] - 2020-08-02
 
 ### Added
 
@@ -190,7 +210,7 @@ All Notable changes to `PHP Domain Parser` starting from the **5.x** series will
 - Support for PHP7.0 and PHP7.1
 - The external data from IANA and mozilla is no longer part of the package and will be downloaded only on demand on composer update/install.
 
-## 5.6.0 - 2019-12-29
+## [5.6.0] - 2019-12-29
 
 ### Added
 
@@ -209,7 +229,7 @@ All Notable changes to `PHP Domain Parser` starting from the **5.x** series will
 
 - None
 
-## 5.5.0 - 2019-04-14
+## [5.5.0] - 2019-04-14
 
 ### Added
 
@@ -232,7 +252,7 @@ All Notable changes to `PHP Domain Parser` starting from the **5.x** series will
 
 - None
 
-## 5.4.0 - 2018-11-22
+## [5.4.0] - 2018-11-22
 
 ### Added
 
@@ -259,7 +279,7 @@ All Notable changes to `PHP Domain Parser` starting from the **5.x** series will
 
 - None
 
-## 5.3.0 - 2018-05-22
+## [5.3.0] - 2018-05-22
 
 ### Added
 
@@ -294,7 +314,7 @@ All Notable changes to `PHP Domain Parser` starting from the **5.x** series will
 
 - None
 
-## 5.2.0 - 2018-02-23
+## [5.2.0] - 2018-02-23
 
 ### Added
 
@@ -320,7 +340,7 @@ All Notable changes to `PHP Domain Parser` starting from the **5.x** series will
 
 - None
 
-## 5.1.0 - 2017-12-18
+## [5.1.0] - 2017-12-18
 
 ### Added
 
@@ -339,7 +359,7 @@ All Notable changes to `PHP Domain Parser` starting from the **5.x** series will
 
 - None
 
-## 5.0.0 - 2017-12-13
+## [5.0.0] - 2017-12-13
 
 ### Added
 
@@ -369,3 +389,21 @@ All Notable changes to `PHP Domain Parser` starting from the **5.x** series will
 - `Pdp\PublicSuffixManager` class replaced by the `Pdp\Manager` class
 - `Pdp\HttpAdapter\HttpAdapterInterface` interface replaced by the `Pdp\HttpClient` interface
 - `Pdp\HttpAdapter\CurlHttpAdapter` class replaced by the `Pdp\CurlHttpClient` class
+
+[6.3.0]: https://github.com/jeremykendall/php-domain-parser/compare/6.2.0...6.3.0
+[6.2.0]: https://github.com/jeremykendall/php-domain-parser/compare/6.1.2...6.2.0
+[6.1.2]: https://github.com/jeremykendall/php-domain-parser/compare/6.1.1...6.1.2
+[6.1.1]: https://github.com/jeremykendall/php-domain-parser/compare/6.1.0...6.1.1
+[6.1.0]: https://github.com/jeremykendall/php-domain-parser/compare/6.0.0...6.1.0
+[6.0.0]: https://github.com/jeremykendall/php-domain-parser/compare/5.7.2...6.0.0
+[6.0.0]: https://github.com/jeremykendall/php-domain-parser/compare/5.7.2...6.0.0
+[5.7.2]: https://github.com/jeremykendall/php-domain-parser/compare/5.7.1...5.7.2
+[5.7.1]: https://github.com/jeremykendall/php-domain-parser/compare/5.7.0...5.7.1
+[5.7.0]: https://github.com/jeremykendall/php-domain-parser/compare/5.6.0...5.7.0
+[5.6.0]: https://github.com/jeremykendall/php-domain-parser/compare/5.5.0...5.6.0
+[5.5.0]: https://github.com/jeremykendall/php-domain-parser/compare/5.4.0...5.5.0
+[5.4.0]: https://github.com/jeremykendall/php-domain-parser/compare/5.3.0...5.4.0
+[5.3.0]: https://github.com/jeremykendall/php-domain-parser/compare/5.2.0...5.3.0
+[5.2.0]: https://github.com/jeremykendall/php-domain-parser/compare/5.1.0...5.3.0
+[5.1.0]: https://github.com/jeremykendall/php-domain-parser/compare/5.0.0...5.1.0
+[5.0.0]: https://github.com/jeremykendall/php-domain-parser/compare/3.0.0...5.0.0
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ PHP Domain Parser is compliant around:
 ### Composer
 
 ~~~
-$ composer require jeremykendall/php-domain-parser
+composer require jeremykendall/php-domain-parser:^6.0
 ~~~
 
 ### System Requirements
@@ -594,7 +594,7 @@ Portions of the `Pdp\Rules` class are derivative works of the PHP
 [registered-domain-libs](https://github.com/usrflo/registered-domain-libs).
 I've included a copy of the Apache Software Foundation License 2.0 in this project.
 
-[ico-github-actions-build]: https://img.shields.io/github/workflow/status/jeremykendall/php-domain-parser/Build?style=flat-square
+[ico-github-actions-build]: https://img.shields.io/github/actions/workflow/status/jeremykendall/php-domain-parser/build.yaml?branch=develop&style=flat-square
 [ico-packagist]: https://img.shields.io/packagist/dt/jeremykendall/php-domain-parser.svg?style=flat-square
 [ico-release]: https://img.shields.io/github/release/jeremykendall/php-domain-parser.svg?style=flat-square
 [ico-license]: https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square

diff --git a/composer.json b/composer.json
@@ -46,13 +46,13 @@
         "ext-json": "*"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^v3.8.0",
+        "friendsofphp/php-cs-fixer": "^v3.13.2",
         "guzzlehttp/guzzle": "^7.5",
         "guzzlehttp/psr7": "^1.6 || ^2.4.3",
-        "phpstan/phpstan": "^1.9",
-        "phpstan/phpstan-phpunit": "^1.2.2",
-        "phpstan/phpstan-strict-rules": "^1.4.4",
-        "phpunit/phpunit": "^9.5.26",
+        "phpstan/phpstan": "^1.10.3",
+        "phpstan/phpstan-phpunit": "^1.3.8",
+        "phpstan/phpstan-strict-rules": "^1.5.0",
+        "phpunit/phpunit": "^10.0.12",
         "psr/http-factory": "^1.0.1",
         "psr/simple-cache": "^1.0.1",
         "symfony/cache": "^v5.0.0 || ^v6.0.0"
@@ -69,14 +69,14 @@
         }
     },
     "scripts": {
-        "phpcs": "php-cs-fixer fix -vvv --diff --dry-run --allow-risky=yes --ansi",
+        "phpcs": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix -vvv --diff --dry-run --allow-risky=yes --ansi",
         "phpcs:fix": "php-cs-fixer fix -vvv --allow-risky=yes --ansi",
-        "phpstan": "phpstan analyse -l max -c phpstan.neon src --memory-limit=256M --ansi",
+        "phpstan": "phpstan analyse -l max -c phpstan.neon src --xdebug --memory-limit=256M --ansi",
         "phpunit": "XDEBUG_MODE=coverage phpunit --coverage-text",
         "test": [
             "@phpunit",
             "@phpstan",
-            "@phpcs:fix"
+            "@phpcs"
         ]
     },
     "scripts-descriptions": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
   bootstrap="vendor/autoload.php"
   backupGlobals="false"
-  backupStaticAttributes="false"
   colors="true"
-  verbose="true"
-  convertErrorsToExceptions="true"
-  convertNoticesToExceptions="true"
-  convertWarningsToExceptions="true"
   processIsolation="false"
-  stopOnFailure="false">
+  stopOnFailure="false"
+  cacheDirectory=".phpunit.cache"
+  backupStaticProperties="false"
+>
   <coverage>
     <include>
       <directory suffix=".php">src</directory>