Merge pull request #343 from jeremykendall/develop

Prepare 6.2 release

Author: nyamsprod

.gitattributes

@@ -4,10 +4,11 @@
 /.gitattributes      export-ignore
 /.github             export-ignore
 /.gitignore          export-ignore
-/.php_cs             export-ignore
+/.php-cs-fixer.php   export-ignore
 /phpstan.neon        export-ignore
 /phpunit.xml.dist    export-ignore
 /psalm.xml           export-ignore
+/test_data/          export-ignore
 /CHANGELOG.md        export-ignore
 /UPGRADING.md        export-ignore
 /README.md           export-ignore

.github/workflows/build.yaml

@@ -1,28 +1,60 @@
 ---
-name: Build
+name: build
 on:
     push: ~
     pull_request: ~
 
 jobs:
-    phpunit:
-        name: PHPUnit tests on ${{ matrix.php }} ${{ matrix.composer-flags }}
-        runs-on: ubuntu-latest
+    linux_tests:
+        name: PHP on ${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.composer-flags }}
+        runs-on: ubuntu-20.04
         strategy:
             matrix:
-                php: [ '7.4', '8.0', '8.1' ]
-                composer-flags: [ '' ]
-                phpunit-flags: [ '--coverage-text' ]
+                php: ['8.1']
+                stability: [prefer-lowest, prefer-stable]
+                include:
+                    -   php: '8.2'
+                        flags: "--ignore-platform-req=php"
+                        phpunit-flags: '--no-coverage'
+                        stability: prefer-stable
         steps:
-            - uses: actions/checkout@v2
-            - uses: shivammathur/setup-php@v2
+            - name: Checkout code
+              uses: actions/checkout@v2
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}
-                  coverage: pcov
+                  coverage: xdebug
                   tools: composer:v2
-            - run: composer update --no-progress ${{ matrix.composer-flags }}
-            - run: composer phpunit
-            - run: composer phpstan
-              if: ${{ matrix.php == '8.1' }}
-            - run: composer phpcs
-              if: ${{ matrix.php == '8.1' }}
+            - name: Check PHP Version
+              run: php -v
+
+            - name: Validate composer files
+              run: composer validate --strict
+
+            - name: Get Composer Cache Directory
+              id: composer-cache
+              run: |
+                  echo "::set-output name=dir::$(composer config cache-files-dir)"
+            - uses: actions/cache@v2
+              with:
+                  path: ${{ steps.composer-cache.outputs.dir }}
+                  key: ${{ runner.os }}-composer-${{ matrix.stability }}-${{ matrix.flags }}-${{ hashFiles('**/composer.lock') }}
+                  restore-keys: |
+                      ${{ runner.os }}-composer-${{ matrix.stability }}-${{ matrix.flags }}-
+                      ${{ runner.os }}-composer-
+
+            - name: Install dependencies
+              run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress ${{ matrix.flags }}
+
+            - name: Run Unit tests with coverage
+              run: composer phpunit -- ${{ matrix.phpunit-flags }}
+
+            - name: Run static analysis
+              run: composer phpstan
+              if: ${{ matrix.php == '8.1' && matrix.stability == 'prefer-stable'}}
+
+            - name: Run Coding style rules
+              run: composer phpcs:fix
+              if: ${{ matrix.php == '8.1' && matrix.stability == 'prefer-stable'}}

.gitignore

@@ -2,6 +2,7 @@ data
 vendor
 docs
 build
+pdp
 .idea
 .php_cs.cache
 .php-cs-fixer.cache

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.2.0 - 2022-10-30
+
+### Added
+
+- None
+
+### Fixed 
+
+- None
+
+### Deprecated
+
+- None
+
+### Removed
+
+- PHP7 and PHP8.0 support
+
 ## 6.1.2 - 2022-09-29
 
 ### Added

composer.json

@@ -10,12 +10,12 @@
     "authors": [
         {
             "name": "Jeremy Kendall",
-            "homepage": "http://about.me/jeremykendall",
+            "homepage": "https://about.me/jeremykendall",
             "role": "Developer"
         },
         {
             "name": "Ignace Nyamagana Butera",
-            "homepage": "http://nyamsprod.com",
+            "homepage": "https://nyamsprod.com",
             "role": "Developer"
         },
         {
@@ -40,22 +40,22 @@
         "psl"
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.1",
         "ext-filter": "*",
         "ext-intl": "*",
         "ext-json": "*"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^v3.5.0",
-        "guzzlehttp/guzzle": "^7.0",
-        "guzzlehttp/psr7": "^1.6||^2.0",
-        "phpstan/phpstan": "^1.4.6.",
-        "phpstan/phpstan-phpunit": "^1.0.0",
-        "phpstan/phpstan-strict-rules": "^1.1.0",
-        "phpunit/phpunit": "^9.5.13",
-        "psr/http-factory": "^1.0",
-        "psr/simple-cache": "^1.0",
-        "symfony/cache": "^v5.0 || ^v6.0"
+        "friendsofphp/php-cs-fixer": "^v3.8.0",
+        "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",
+        "psr/http-factory": "^1.0.1",
+        "psr/simple-cache": "^1.0.1",
+        "symfony/cache": "^v5.0.0 || ^v6.0.0"
     },
     "suggest": {
         "psr/http-client-implementation": "To use the storage functionnality which depends on PSR-18",
@@ -72,8 +72,7 @@
         "phpcs": "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",
-        "psalm": "psalm --show-info=true",
-        "phpunit": "phpunit --coverage-text",
+        "phpunit": "XDEBUG_MODE=coverage phpunit --coverage-text",
         "test": [
             "@phpunit",
             "@phpstan",