Updated QA settings for 5.1 test utilities2

Author: WyriHaximus

.php_cs

@@ -0,0 +1,21 @@
+<?php declare(strict_types=1);
+
+use ApiClients\Tools\CsFixerConfig\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)
+    ;
+})();

.travis.yml

@@ -1,43 +1,51 @@
 language: php
-sudo: false
 
 ## Cache composer bits
 cache:
   directories:
-    - $HOME/.composer/cache
-    - $HOME/.humbug
-
-## PHP versions we test against
-php:
-  - 7.0
-  - 7.1
-  - nightly
+    - $HOME/.composer/cache/files
 
 ## Build matrix for lowest and highest possible targets
 matrix:
   include:
-    - php: 7.0
-      env: dependencies=lowest
-    - php: 7.1
-      env: dependencies=lowest
+    - php: 7.2
+      env:
+        - qaExtended=true
+        - dropPlatform=false
+    - php: nightly
+      env:
+        - dropPlatform=false
+    - php: 7.2
+      env:
+        - dependencies=lowest
+        - dropPlatform=false
     - php: nightly
-      env: dependencies=lowest
-    - php: 7.0
-      env: dependencies=highest
-    - php: 7.1
-      env: dependencies=highest
+      env:
+        - dependencies=lowest
+        - dropPlatform=false
+    - php: 7.2
+      env:
+        - dependencies=highest
+        - dropPlatform=false
     - php: nightly
-      env: dependencies=highest
+      env:
+        - dependencies=highest
+        - dropPlatform=false
 
 ## Install or update dependencies
 install:
+  - composer validate
+  - 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: make ci
+script:
+  - 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,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

appveyor.yml

@@ -7,25 +7,15 @@ clone_folder: c:\projects\php-project-workspace
 environment:
   matrix:
   - dependencies: lowest
-    php_ver_target: 7.0
-  - dependencies: lowest
-    php_ver_target: 7.1
-  - dependencies: current
-    php_ver_target: 7.0
+    php_ver_target: 7.2
   - dependencies: current
-    php_ver_target: 7.1
-  - dependencies: highest
-    php_ver_target: 7.0
+    php_ver_target: 7.2
   - dependencies: highest
-    php_ver_target: 7.1
+    php_ver_target: 7.2
 
-## Cache composer, chocolatey and php bits
+## Cache composer file
 cache:
     - '%LOCALAPPDATA%\Composer\files -> composer.lock'
-    - composer.phar
-    - C:\ProgramData\chocolatey\bin -> .appveyor.yml
-    - C:\ProgramData\chocolatey\lib -> .appveyor.yml
-    - c:\tools\php -> .appveyor.yml
 
 ## Set up environment varriables
 init:
@@ -48,6 +38,7 @@ install:
     - IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
     - appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
     - cd c:\projects\php-project-workspace
+    - composer config --unset platform.php
     - IF %dependencies%==lowest appveyor-retry composer update --prefer-lowest --no-progress --profile -n
     - IF %dependencies%==current appveyor-retry composer install --no-progress --profile
     - IF %dependencies%==highest appveyor-retry composer update --no-progress --profile -n

composer.json

@@ -8,7 +8,7 @@
     }
   ],
   "require": {
-    "php": "^7.0",
+    "php": "^7.2",
     "api-clients/middleware": "^4.0",
     "psr/log": "^1.0"
   },
@@ -27,28 +27,53 @@
     }
   },
   "config": {
-    "sort-packages": true
+    "sort-packages": true,
+    "platform": {
+      "php": "7.2"
+    }
   },
   "scripts": {
     "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"

composer.lock

@@ -136,7 +136,7 @@ protected function iterateHeaders(
         array $ignoreHeaders
     ): array {
         foreach ($headers as $header => $value) {
-            if (in_array($header, $ignoreHeaders)) {
+            if (in_array($header, $ignoreHeaders, true)) {
                 continue;
             }
 

src/LoggerMiddleware.php

@@ -2,11 +2,6 @@
 
 namespace ApiClients\Middleware\Log;
 
-use ApiClients\Tools\Psr7\Oauth1\Definition\AccessToken;
-use ApiClients\Tools\Psr7\Oauth1\Definition\ConsumerKey;
-use ApiClients\Tools\Psr7\Oauth1\Definition\ConsumerSecret;
-use ApiClients\Tools\Psr7\Oauth1\Definition\TokenSecret;
-
 final class Options
 {
     const IGNORE_HEADERS = 'ignore_headers';

src/Options.php

@@ -44,7 +44,6 @@ public function testNoConfig()
         $middleware->error($exception, 'abc', $options);
     }
 
-
     public function testLog()
     {
         $options = [
@@ -126,9 +125,7 @@ public function testLogError()
                 'X-Ignore-Request' => 'nope',
             ]
         );
-        $exception = new class(
-            'New Exception'
-        ) extends Exception {
+        $exception = new class('New Exception') extends Exception {
             public function getResponse()
             {
                 return new Response(