Merge pull request #53 from jaylinski/php81

Move away from GrumPHP and test on PHP 8.1

Author: shulard

.github/workflows/continuous-integration.yml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest, windows-latest, macOS-latest]
-        php-versions: ['7.3', '7.4', '8.0']
+        php-versions: ['7.3', '7.4', '8.0', '8.1']
         composer-versions: ['composer:v1', 'composer:v2']
 
     steps:
@@ -47,14 +47,13 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
 
-      - name: Run Grumphp
-        run: vendor/bin/grumphp run --no-ansi -n
-
-      - name: Send PSALM data
-        run: vendor/bin/psalm --shepherd --stats src/
-        continue-on-error: true
+      - name: Run tests
+        run: |
+          composer run analyse
+          composer run lint
+          composer run test
 
       - name: Send Scrutinizer data
         run: |

.gitignore

@@ -1,3 +1,4 @@
 /coverage/
 /composer.lock
 /vendor/
+.php-cs-fixer.cache

README.md

@@ -51,7 +51,7 @@ extensions:
 This will sufficient to enable Code Coverage generation by using defaults
 provided by the extension. This extension supports various [configuration
 options](#Options). For a fully annotated example configuration
-file check [Configuration section](#Configuration).
+file check [configuration section](#Configuration).
 
 ## Usage
 

composer.json

@@ -1,7 +1,8 @@
 {
     "name": "friends-of-phpspec/phpspec-code-coverage",
-    "type": "library",
     "description": "Generate Code Coverage reports for PhpSpec tests",
+    "license": "MIT",
+    "type": "library",
     "keywords": [
         "phpspec",
         "coverage",
@@ -11,8 +12,6 @@
         "code-coverage",
         "spec"
     ],
-    "homepage": "https://github.com/friends-of-phpspec/phpspec-code-coverage",
-    "license": "MIT",
     "authors": [
         {
             "name": "ek9",
@@ -37,27 +36,29 @@
             "homepage": "https://github.com/jaylinski"
         }
     ],
+    "homepage": "https://github.com/friends-of-phpspec/phpspec-code-coverage",
+    "support": {
+        "issues": "https://github.com/friends-of-phpspec/phpspec-code-coverage/issues",
+        "source": "https://github.com/friends-of-phpspec/phpspec-code-coverage",
+        "docs": "https://github.com/friends-of-phpspec/phpspec-code-coverage#phpspec-code-coverage"
+    },
     "require": {
         "php": ">= 7.3",
         "phpspec/phpspec": "^6.0 || ^7.0",
         "phpunit/php-code-coverage": "^9.0"
     },
+    "require-dev": {
+        "phpstan/phpstan": "^1.5",
+        "friendsofphp/php-cs-fixer": "^3.4"
+    },
     "conflict": {
         "sebastian/comparator": "< 2.0"
     },
-    "require-dev": {
-        "drupol/php-conventions": "^3.0",
-        "vimeo/psalm": "^4.7"
-    },
     "suggest": {
         "ext-pcov": "Install PCov extension to generate code coverage.",
         "ext-xdebug": "Install Xdebug to generate phpspec code coverage."
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "6.x-dev"
-        }
-    },
+    "minimum-stability": "stable",
     "autoload": {
         "psr-4": {
             "FriendsOfPhpSpec\\PhpSpec\\CodeCoverage\\": "src/"
@@ -66,13 +67,14 @@
             "src/bootstrap.php"
         ]
     },
-    "minimum-stability": "stable",
     "scripts": {
-        "grumphp": "./vendor/bin/grumphp run"
+        "analyse": "phpstan analyse --level 8 src",
+        "lint": "php-cs-fixer fix --dry-run src && php-cs-fixer fix --dry-run spec",
+        "test": "phpspec run"
     },
-    "support": {
-        "issues": "https://github.com/friends-of-phpspec/phpspec-code-coverage/issues",
-        "source": "https://github.com/friends-of-phpspec/phpspec-code-coverage",
-        "docs": "https://github.com/friends-of-phpspec/phpspec-code-coverage#phpspec-code-coverage"
+    "extra": {
+        "branch-alias": {
+            "dev-master": "6.x-dev"
+        }
     }
 }