Merge pull request #3 from Phauthentic/develop

Enable PHP 8

Author: burzum

.github/workflows/ci.yml

@@ -0,0 +1,69 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  testsuite:
+    name: Unittests
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version: ['7.4', '8.0']
+
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        fetch-depth: 1
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-version }}
+        extensions: json, pdo, ldap
+        tools: pecl
+        coverage: pcov
+
+    - name: Composer install
+      run: |
+        if [[ ${{ matrix.prefer-lowest == '7.4' }} ]]; then
+          composer update --prefer-lowest --prefer-stable
+        else
+          composer install
+        fi
+    - name: Run PHPUnit
+      run: |
+        if [[ ${{ matrix.php-version }} == '7.4' ]]; then
+          bin/phpunit --coverage-clover=coverage.xml
+        else
+          bin/phpunit
+        fi
+    - name: Code Coverage Report
+      if: success() && matrix.php-version == '7.4'
+      uses: codecov/codecov-action@v2
+
+  validation:
+    name: Coding Standard & Static Analysis
+    runs-on: ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 1
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '7.4'
+        extensions: json, pdo, ldap
+        coverage: none
+        tools: pecl
+
+    - name: Composer install
+      run: composer update --prefer-stable
+
+    - name: Run phpcs
+      run: bin/phpcs --version && bin/phpcs --report=checkstyle --standard=phpcs.xml src/ tests/
+
+    - name: Run phpstan
+      run: bin/phpstan -V && bin/phpstan --error-format=github

.scrutinizer.yml

@@ -3,7 +3,7 @@ build:
         analysis:
             environment:
                 php:
-                    version: 7.3
+                    version: 7.4
             project_setup:
                 override:
                     - 'true'
@@ -15,14 +15,14 @@ build:
                        coverage:
                            file: 'coverage.xml'
                            format: 'php-clover'
-        php73:
-            environment:
-                php:
-                    version: 7.3
         php74:
             environment:
                 php:
                     version: 7.4
+        php80:
+            environment:
+                php:
+                    version: 8.0
 filter:
     excluded_paths:
         - 'tests/*'

composer.json

@@ -3,16 +3,16 @@
     "description": "Correlation ID and PSR7 middleware to inject it",
     "type": "library",
     "require": {
-		"php": "^7.2",
-        "ramsey/uuid": "^3.0",
+		"php": "^7.4 || ^8.0 || ^8.1",
+        "ramsey/uuid": "^3.0 || ^4.0",
         "psr/http-message": "^1.0",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.0",
-        "phpstan/phpstan": "^0.11.0",
-        "squizlabs/php_codesniffer": "^3.5"
+        "phpunit/phpunit": "^9.0",
+        "phpstan/phpstan": "^0.12.0",
+        "squizlabs/php_codesniffer": "^3.6"
     },
     "license": "MIT",
     "authors": [
@@ -33,19 +33,19 @@
     "minimum-stability": "stable",
     "scripts": {
         "test": [
-            ".\\bin\\phpunit"
+            "phpunit"
         ],
         "coverage": [
-            ".\\bin\\phpunit --coverage-html ./tmp/coverage"
+            "phpunit --coverage-html ./tmp/coverage"
         ],
         "cscheck": [
-            ".\\bin\\phpcs .\\src .\\tests --standard=.\\phpcs.xml"
+            "phpcs ./src ./tests --standard=./phpcs.xml"
         ],
         "csfix": [
-            ".\\bin\\phpcbf .\\src .\\tests --standard=.\\phpcs.xml"
+            "phpcbf ./src ./tests --standard=./phpcs.xml"
         ],
         "analyze": [
-            ".\\bin\\phpstan analyse -l 5 -c phpstan.neon .\\src\\"
+            "phpstan analyse -c phpstan.neon ./src/"
         ]
     },
     "config": {