Revamped QA toolset

Signed-off-by: Cees-Jan Kiewiet <ceesjank@gmail.com>

Author: WyriHaximus

.github/workflows/ci.yml

@@ -8,15 +8,15 @@ jobs:
   composer-install:
     strategy:
       matrix:
-        php: [7.3, 7.4]
+        php: [7.4]
         composer: [lowest, current, highest]
     runs-on: ubuntu-latest
     container:
       image: wyrihaximusnet/php:${{ matrix.php }}-zts-alpine3.10-dev-root
     steps:
       - uses: actions/checkout@v1
       - name: Cache composer packages
-        uses: actions/cache@v1.0.1
+        uses: actions/cache@v1
         with:
           path: ./vendor/
           key: ${{ matrix.composer }}-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
@@ -32,7 +32,7 @@ jobs:
   qa:
     strategy:
       matrix:
-        php: [7.3, 7.4]
+        php: [7.4]
         composer: [lowest, current, highest]
         qa: [lint, cs, stan, psalm, composer-require-checker, composer-unused]
     needs: composer-install
@@ -42,7 +42,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Cache composer packages
-        uses: actions/cache@v1.0.1
+        uses: actions/cache@v1
         with:
           path: ./vendor/
           key: ${{ matrix.composer }}-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}

.php_cs

@@ -1,47 +1,36 @@
-all:
-	composer run-script qa-all --timeout=0
+# set all to phony
+SHELL=bash
 
-all-extended:
-	composer run-script qa-all-extended --timeout=0
+.PHONY: *
 
-ci:
-	composer run-script qa-ci --timeout=0
+ifneq ("$(wildcard /.dockerenv)","")
+    DOCKER_RUN=
+else
+	DOCKER_RUN=docker run --rm -it \
+		-v `pwd`:`pwd` \
+		-w `pwd` \
+		"wyrihaximusnet/php:7.4-zts-alpine3.10-dev"
+endif
 
-ci-extended:
-	composer run-script qa-ci-extended --timeout=0
+all: lint cs-fix cs stan psalm composer-require-checker composer-unused
 
-ci-windows:
-	composer run-script qa-ci-windows --timeout=0
-
-contrib:
-	composer run-script qa-contrib --timeout=0
+lint:
+	$(DOCKER_RUN) vendor/bin/parallel-lint --exclude vendor .
 
 cs:
-	composer cs
+	$(DOCKER_RUN) vendor/bin/phpcs --parallel=$(nproc)
 
 cs-fix:
-	composer cs-fix
-
-unit:
-	composer run-script unit --timeout=0
-
-lint:
-	composer run-script lint --timeout=0
+	$(DOCKER_RUN) vendor/bin/phpcbf --parallel=$(nproc)
 
 stan:
-	composer run-script stan --timeout=0
+	$(DOCKER_RUN) vendor/bin/phpstan analyse src --level max --ansi -c phpstan.neon
 
 psalm:
-	composer run-script psalm --timeout=0
+	$(DOCKER_RUN) vendor/bin/psalm --threads=$(nproc)
 
 composer-require-checker:
-	composer run-script composer-require-checker --timeout=0
+	$(DOCKER_RUN) vendor/bin/composer-require-checker --ignore-parse-errors --ansi -vvv
 
 composer-unused:
-	composer unused
-
-unit-coverage:
-	composer run-script unit-coverage --timeout=0
-
-ci-coverage:
-	composer ci-coverage
+	$(DOCKER_RUN) composer unused --ansi

Makefile

@@ -10,12 +10,13 @@
         }
     ],
     "require": {
-        "php": "^7.3",
+        "php": "^7.4",
         "ext-parallel": "*",
         "moneyphp/money": "^3.2 || ^3.2.1",
         "ocramius/package-versions": "^1.4",
         "react/event-loop": "^1.1",
         "react/promise": "^2.7",
+        "thecodingmachine/safe": "v1.0.0 as v0.1.17",
         "wyrihaximus/async-test-utilities": "^1.1",
         "wyrihaximus/iterator-or-array-to-array": "^1.1",
         "wyrihaximus/pool-info": "^1.0",
@@ -25,11 +26,13 @@
         "wyrihaximus/ticking-promise": "^1.6"
     },
     "require-dev": {
-        "wyrihaximus/async-test-utilities": "^1.2.1"
+        "wyrihaximus/async-test-utilities": "dev-update-to-test-utilities-2.0 as 1.999.999",
+        "wyrihaximus/coding-standard": "dev-master",
+        "wyrihaximus/test-utilities": "dev-swap-cs-toolkit"
     },
     "config": {
         "platform": {
-            "php": "7.3"
+            "php": "7.4"
         },
         "sort-packages": true
     },
@@ -38,66 +41,14 @@
             "WyriHaximus\\React\\Tests\\Parallel\\": "src/"
         }
     },
+    "minimum-stability": "beta",
+    "prefer-stable": true,
     "scripts": {
         "post-install-cmd": [
             "composer normalize"
         ],
         "post-update-cmd": [
             "composer normalize"
-        ],
-        "ci-coverage": [
-            "if [ -f ./build/logs/clover.xml ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover ./build/logs/clover.xml; fi"
-        ],
-        "composer-require-checker": [
-            "composer-require-checker --ignore-parse-errors --ansi -vvv  --config-file=composer-require-checker.json"
-        ],
-        "cs": [
-            "php-cs-fixer fix --config=.php_cs --ansi --dry-run --diff --verbose --allow-risky=yes --show-progress=estimating"
-        ],
-        "cs-fix": [
-            "php-cs-fixer fix --config=.php_cs --ansi --verbose --allow-risky=yes --show-progress=estimating"
-        ],
-        "ensure-installed": "composer install --ansi -n -q",
-        "lint": [
-            "parallel-lint --exclude vendor ."
-        ],
-        "psalm": [
-            "psalm --threads=$(nproc)"
-        ],
-        "qa-all": [
-            "composer validate --ansi",
-            "composer normalize --ansi",
-            "composer unused --ansi",
-            "@lint",
-            "@cs",
-            "@stan",
-            "@psalm",
-            "@composer-require-checker"
-        ],
-        "qa-all-extended": [
-            "composer validate --ansi",
-            "composer normalize --ansi",
-            "composer unused --ansi",
-            "@lint",
-            "@cs",
-            "@stan",
-            "@psalm",
-            "@composer-require-checker"
-        ],
-        "qa-ci": [
-            "@unit"
-        ],
-        "qa-ci-extended": [
-            "@qa-all-extended"
-        ],
-        "qa-ci-windows": [
-            "@qa-windows"
-        ],
-        "qa-contrib": [
-            "@qa-all"
-        ],
-        "stan": [
-            "phpstan analyse src --level max --ansi -c phpstan.neon"
         ]
     }
 }