Updated to test-utilities 4.1+ with new CS fixer on board

Author: WyriHaximus

.php_cs

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

.travis.yml

@@ -1,62 +1,55 @@
 language: php
-sudo: false
 
 ## Cache composer bits
 cache:
   directories:
-    - $HOME/.composer/cache
-
-## PHP versions we test against
-php:
-  - 7.0
-  - 7.1
-  - nightly
-
-## Environment variables
-env:
-  - coverage=true
+    - $HOME/.composer/cache/files
 
 ## Build matrix for lowest and highest possible targets
 matrix:
   include:
+    - php: 7.0
+      env:
+        - qaExtended=true
+    - php: 7.1
+    - php: nightly
+      env:
+        - dropPlatform=false
     - php: 7.0
       env:
         - dependencies=lowest
-        - coverage=false
     - php: 7.1
       env:
         - dependencies=lowest
-        - coverage=false
     - php: nightly
       env:
         - dependencies=lowest
-        - coverage=false
+        - dropPlatform=false
     - php: 7.0
       env:
         - dependencies=highest
-        - coverage=false
     - php: 7.1
       env:
         - dependencies=highest
-        - coverage=false
     - php: nightly
       env:
         - dependencies=highest
-        - coverage=false
+        - dropPlatform=false
 
 ## Install or update dependencies
 install:
   - composer validate
-  - if [ "$coverage" = "false" ]; then phpenv config-rm xdebug.ini || :; fi;
+  - if [ -z "$dropPlatform" ]; then composer config --unset platform.php; fi;
+  - if [ -z "$qaExtended" ]; then phpenv config-rm xdebug.ini || :; fi;
   - if [ -z "$dependencies" ]; then composer install --prefer-dist; fi;
   - if [ "$dependencies" = "lowest" ]; then composer update --prefer-lowest --prefer-dist -n; fi;
   - if [ "$dependencies" = "highest" ]; then composer update --prefer-dist -n; fi;
   - composer show
 
 ## Run the actual test
 script:
-  - if [ "$coverage" = "false" ]; then make ci; fi;
-  - if [ "$coverage" = "true" ]; then make ci-with-coverage; fi;
+  - if [ -z "$qaExtended" ]; then make ci; fi;
+  - if [ "$qaExtended" = "true" ]; then make ci-extended; fi;
 
 ## Gather coverage and set it to coverage servers
-after_script: make ci-coverage
+after_script: if [ "$qaExtended" = "true" ]; then make ci-coverage; fi;

Makefile

@@ -1,24 +1,35 @@
-all: cs unit
-travis: cs travis-unit
-contrib: cs unit
+all:
+	composer run-script qa-all --timeout=0
+
+all-coverage:
+	composer run-script qa-all-coverage --timeout=0
+
+ci:
+	composer run-script qa-ci --timeout=0
+
+ci-with-coverage:
+	composer run-script qa-ci-coverage --timeout=0
+
+contrib:
+	composer run-script qa-contrib --timeout=0
 
 init:
-	if [ ! -d vendor ]; then composer install; fi;
+	composer ensure-installed
 
-cs: init
-	./vendor/bin/phpcs --standard=PSR2 src/
+cs:
+	composer cs
 
-unit: init
-	./vendor/bin/phpunit --coverage-text --coverage-html covHtml
+cs-fix:
+	composer cs-fix
 
-ci: init
-	./vendor/bin/phpunit --coverage-text --coverage-clover ./build/logs/clover.xml
+unit:
+	composer run-script unit --timeout=0
 
-ci-with-coverage: init
-	./vendor/bin/phpunit --coverage-text --coverage-clover ./build/logs/clover.xml
+unit-coverage:
+	composer run-script unit-coverage --timeout=0
 
 ci-coverage: init
-	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 ci-coverage
 
 generate-resources: init
 	./vendor/bin/api-client-resource-generator ./resources.yml

composer.json

@@ -13,7 +13,9 @@
     ],
     "require": {
         "php": "^7.0",
+        "api-clients/client-services": "^1.1",
         "api-clients/foundation": "dev-master",
+        "api-clients/middleware-http-exceptions": "^1.0",
         "api-clients/middleware-json": "^1.0",
         "api-clients/middleware-oauth1": "^3.0",
         "api-clients/middleware-user-agent": "^1.0",
@@ -24,7 +26,7 @@
     "require-dev": {
         "api-clients/resource-generator": "dev-master",
         "api-clients/resource-test-utilities": "dev-master",
-        "api-clients/test-utilities": "^3.0.1"
+        "api-clients/test-utilities": "^4.1"
     },
     "autoload": {
         "psr-4": {
@@ -38,5 +40,58 @@
     },
     "config": {
         "sort-packages": true
+    },
+    "scripts": {
+        "ensure-installed": "composer install --ansi -n -q",
+        "cs": [
+            "@ensure-installed",
+            "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"
+        ],
+        "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"
+        ],
+        "qa-ci-coverage": [
+            "@qa-all-coverage"
+        ],
+        "qa-ci-windows": [
+            "@qa-windows"
+        ],
+        "qa-contrib": [
+            "@qa-all"
+        ],
+        "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"
+        ]
     }
 }