Updated to latest CS tooling

Author: WyriHaximus

.php_cs

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

.travis.yml

@@ -5,57 +5,51 @@ cache:
   directories:
     - $HOME/.composer/cache/files
 
-## PHP versions we test against
-php:
-  - 7.0
-  - 7.1
-  - nightly
-
-## Environment variables
-env:
-  - coverage=true
-
 ## 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

@@ -7,8 +7,8 @@ all-coverage:
 ci:
 	composer run-script qa-ci --timeout=0
 
-ci-with-coverage:
-	composer run-script qa-ci-coverage --timeout=0
+ci-extended:
+	composer run-script qa-ci-extended --timeout=0
 
 contrib:
 	composer run-script qa-contrib --timeout=0
@@ -19,6 +19,9 @@ init:
 cs:
 	composer cs
 
+cs-fix:
+	composer cs-fix
+
 unit:
 	composer run-script unit --timeout=0
 

composer.json

@@ -30,7 +30,7 @@
     "api-clients/middleware-delay": "^2.0",
     "api-clients/middleware-pool": "^2.0",
     "api-clients/resource-generator": "dev-master",
-    "api-clients/test-utilities": "^3.0.1"
+    "api-clients/test-utilities": "^4.1"
   },
   "suggest": {
     "api-clients/middleware-delay": "Add a delay between requests to not hammer Travis",
@@ -47,7 +47,10 @@
     }
   },
   "config": {
-    "sort-packages": true
+    "sort-packages": true,
+    "platform": {
+      "php": "7.0"
+    }
   },
   "extra": {
     "api-clients": {
@@ -61,7 +64,11 @@
     "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",
@@ -91,9 +98,9 @@
       "@unit"
     ],
     "qa-ci": [
-      "@qa-all"
+      "@unit"
     ],
-    "qa-ci-coverage": [
+    "qa-ci-extended": [
       "@qa-all-coverage"
     ],
     "qa-ci-windows": [