Bump to PHP 7.4+

Author: WyriHaximus

.github/workflows/ci.yml

@@ -34,7 +34,7 @@ jobs:
       matrix:
         php: [7.4]
         composer: [lowest, current, highest]
-        qa: [lint, cs, stan, psalm, composer-require-checker, composer-unused]
+        qa: [lint, cs, stan, psalm, unit, infection, composer-require-checker, composer-unused]
     needs: composer-install
     runs-on: ubuntu-latest
     container:

.travis.yml

@@ -1,41 +1,42 @@
-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.11-dev"
+endif
 
-ci-extended:
-	composer run-script qa-ci-extended --timeout=0
+all: lint cs-fix cs stan psalm unit infection composer-require-checker composer-unused
 
-ci-windows:
-	composer run-script qa-ci-windows --timeout=0
-
-contrib:
-	composer run-script qa-contrib --timeout=0
-
-init:
-	composer ensure-installed
+lint:
+	$(DOCKER_RUN) vendor/bin/parallel-lint --exclude vendor .
 
 cs:
-	composer cs
+	$(DOCKER_RUN) vendor/bin/phpcs --parallel=$(nproc)
 
 cs-fix:
-	composer cs-fix
+	$(DOCKER_RUN) vendor/bin/phpcbf --parallel=$(nproc)
 
-infection:
-	composer infection
+stan:
+	$(DOCKER_RUN) vendor/bin/phpstan analyse src tests --level max --ansi -c phpstan.neon
+
+psalm:
+	$(DOCKER_RUN) vendor/bin/psalm --threads=$(nproc) --shepherd --stats
 
 unit:
-	composer run-script unit --timeout=0
+	$(DOCKER_RUN) vendor/bin/phpunit --colors=always -c phpunit.xml.dist --coverage-text --coverage-html covHtml --coverage-clover ./build/logs/clover.xml
 
-stan:
-	composer run-script stan --timeout=0
+infection:
+	$(DOCKER_RUN) vendor/bin/infection --ansi --min-msi=100 --min-covered-msi=100 --threads=$(nproc)
 
-unit-coverage:
-	composer run-script unit-coverage --timeout=0
+composer-require-checker:
+	$(DOCKER_RUN) vendor/bin/composer-require-checker --ignore-parse-errors --ansi -vvv
 
-ci-coverage: init
-	composer ci-coverage
+composer-unused:
+	$(DOCKER_RUN) composer unused --ansi

Makefile

@@ -10,21 +10,27 @@
         }
     ],
     "require": {
-        "php": "^7.3",
+        "php": "^7.4",
         "ext-parallel": "*",
         "react/event-loop": "^1.1",
         "react/promise": "^2.7"
     },
     "require-dev": {
-        "thecodingmachine/safe": "^0.1.16",
-        "wyrihaximus/async-test-utilities": "^1.1"
+        "thecodingmachine/safe": "1.0.0 as 0.1.17",
+        "wyrihaximus/async-test-utilities": "dev-update-to-test-utilities-2.0 as 1.999.999"
     },
     "config": {
         "platform": {
-            "php": "7.3"
+            "php": "7.4"
         },
         "sort-packages": true
     },
+    "extra": {
+        "unused": [
+            "php",
+            "ext-parallel"
+        ]
+    },
     "autoload": {
         "psr-4": {
             "ReactParallel\\FutureToPromiseConverter\\": "src/"
@@ -35,76 +41,14 @@
             "ReactParallel\\Tests\\FutureToPromiseConverter\\": "tests/"
         }
     },
+    "minimum-stability": "dev",
+    "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"
-        ],
-        "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"
-        ],
-        "infection": [
-            "infection --ansi --threads=4"
-        ],
-        "lint-php": [
-            "parallel-lint --exclude vendor ."
-        ],
-        "qa-all": [
-            "composer validate --ansi",
-            "composer normalize --ansi",
-            "@lint-php",
-            "@cs",
-            "@stan",
-            "@unit",
-            "@infection"
-        ],
-        "qa-all-extended": [
-            "composer validate --ansi",
-            "composer normalize --ansi",
-            "@lint-php",
-            "@cs",
-            "@stan",
-            "@unit-coverage",
-            "@infection"
-        ],
-        "qa-ci": [
-            "@unit"
-        ],
-        "qa-ci-extended": [
-            "composer validate --ansi",
-            "@lint-php",
-            "@cs",
-            "@stan",
-            "@unit-coverage"
-        ],
-        "qa-ci-windows": [
-            "@qa-windows"
-        ],
-        "qa-contrib": [
-            "@qa-all"
-        ],
-        "qa-windows": [
-            "@lint-php",
-            "@cs",
-            "@stan",
-            "@unit"
-        ],
-        "stan": [
-            "phpstan analyse src tests --level max --ansi -c phpstan.neon"
-        ],
-        "unit": [
-            "phpunit --colors=always -c phpunit.xml.dist"
-        ],
-        "unit-coverage": [
-            "phpunit --colors=always -c phpunit.xml.dist --coverage-text --coverage-html covHtml --coverage-clover ./build/logs/clover.xml"
         ]
     }
 }