Updated test utilities

Author: WyriHaximus

.php_cs

@@ -0,0 +1,21 @@
+<?php declare(strict_types=1);
+
+use ApiClients\Tools\TestUtilities\PhpCsFixerConfig;
+use PhpCsFixer\Config;
+
+return (function (): Config
+{
+    $paths = [
+        __DIR__ . DIRECTORY_SEPARATOR . 'src',
+        __DIR__ . DIRECTORY_SEPARATOR . 'tests',
+    ];
+
+    return PhpCsFixerConfig::create()
+        ->setFinder(
+            PhpCsFixer\Finder::create()
+                ->in($paths)
+                ->append($paths)
+        )
+        ->setUsingCache(false)
+    ;
+})();

Makefile

@@ -1,20 +1,32 @@
 all:
-	composer qa-all
+	composer run-script qa-all --timeout=0
+
+all-coverage:
+	composer run-script qa-all-coverage --timeout=0
 
 ci:
-	composer qa-ci
+	composer run-script qa-ci --timeout=0
+
+ci-extended:
+	composer run-script qa-ci-extended --timeout=0
 
 contrib:
-	composer qa-contrib
+	composer run-script qa-contrib --timeout=0
 
 init:
 	composer ensure-installed
 
 cs:
 	composer cs
 
+cs-fix:
+	composer cs-fix
+
 unit:
-	composer unit
+	composer run-script unit --timeout=0
+
+unit-coverage:
+	composer run-script unit-coverage --timeout=0
 
 ci-coverage: init
 	composer ci-coverage

composer.json

@@ -13,12 +13,11 @@
     "api-clients/hydrator": "^1.0.1",
     "api-clients/middleware": "^4.0 || ^3.0 || ^2.0 || ^1.1",
     "api-clients/transport": "^3.0 || ^2.0 || ^1.0",
-    "league/event": "^2.1",
     "php-di/php-di": "^5.4.3",
     "psr/container": "^1.0"
   },
   "require-dev": {
-    "api-clients/test-utilities": "^3.0.1"
+    "api-clients/test-utilities": "^4.1"
   },
   "suggest": {
     "api-clients/resource-generator": "Easy wireframing of resources"
@@ -47,22 +46,44 @@
     "ensure-installed": "composer install --ansi -n -q",
     "cs": [
       "@ensure-installed",
-      "phpcs --standard=PSR2 src/"
+      "php-cs-fixer fix --config=.php_cs --ansi --dry-run --diff --verbose --allow-risky=yes --show-progress=estimating"
+    ],
+    "cs-fix": [
+      "@ensure-installed",
+      "php-cs-fixer fix --config=.php_cs --ansi --verbose --allow-risky=yes --show-progress=estimating"
     ],
     "unit": [
       "@ensure-installed",
-      "phpunit --colors=always -c phpunit.xml.dist --coverage-text --coverage-html covHtml"
+      "phpunit --colors=always -c phpunit.xml.dist"
+    ],
+    "unit-coverage": [
+      "@ensure-installed",
+      "phpunit --colors=always -c phpunit.xml.dist --coverage-text --coverage-html covHtml --coverage-clover ./build/logs/clover.xml"
+    ],
+    "lint-php": [
+      "@ensure-installed",
+      "parallel-lint --exclude vendor ."
     ],
     "qa-all": [
+      "@lint-php",
       "@cs",
       "@unit"
     ],
+    "qa-all-coverage": [
+      "@lint-php",
+      "@cs",
+      "@unit-coverage"
+    ],
     "qa-windows": [
+      "@lint-php",
       "@cs",
       "@unit"
     ],
     "qa-ci": [
-      "@qa-all"
+      "@unit"
+    ],
+    "qa-ci-extended": [
+      "@qa-all-coverage"
     ],
     "qa-ci-windows": [
       "@qa-windows"