Updated QA config files to the new test utilities set up

Author: WyriHaximus

.php_cs

@@ -0,0 +1,22 @@
+<?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,62 +1,51 @@
 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
+    - php: 7.2
       env:
-        - dependencies=lowest
-        - coverage=false
-    - php: 7.1
+        - qaExtended=true
+        - dropPlatform=false
+    - php: nightly
+      env:
+        - dropPlatform=false
+    - php: 7.2
       env:
         - dependencies=lowest
-        - coverage=false
+        - dropPlatform=false
     - php: nightly
       env:
         - dependencies=lowest
-        - coverage=false
-    - php: 7.0
-      env:
-        - dependencies=highest
-        - coverage=false
-    - php: 7.1
+        - dropPlatform=false
+    - php: 7.2
       env:
         - dependencies=highest
-        - coverage=false
+        - dropPlatform=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,11 +19,14 @@ init:
 cs:
 	composer cs
 
+cs-fix:
+	composer cs-fix
+
 unit:
 	composer run-script unit --timeout=0
 
 unit-coverage:
 	composer run-script unit-coverage --timeout=0
 
 ci-coverage: init
-	composer ci-coverage
+	composer ci-coverage

appveyor.yml

@@ -6,50 +6,45 @@ clone_folder: c:\projects\php-project-workspace
 ## Build matrix for lowest and highest possible targets
 environment:
   matrix:
-  - dependencies: lowest
-    php_ver_target: 7.0
-  - dependencies: lowest
-    php_ver_target: 7.1
-  - dependencies: current
-    php_ver_target: 7.0
-  - dependencies: current
-    php_ver_target: 7.1
-  - dependencies: highest
-    php_ver_target: 7.0
-  - dependencies: highest
-    php_ver_target: 7.1
+    - dependencies: lowest
+      php_ver_target: 7.2
+    - dependencies: current
+      php_ver_target: 7.2
+    - dependencies: highest
+      php_ver_target: 7.2
 
-## Cache composer bits
+## Cache composer file
 cache:
-    - '%LOCALAPPDATA%\Composer\files -> composer.lock'
+  - '%LOCALAPPDATA%\Composer\files -> composer.lock'
 
 ## Set up environment varriables
 init:
-    - SET PATH=C:\Program Files\OpenSSL;c:\tools\php;%PATH%
-    - SET COMPOSER_NO_INTERACTION=1
-    - SET PHP=1
-    - SET ANSICON=121x90 (121x90)
+  - SET PATH=C:\Program Files\OpenSSL;c:\tools\php;%PATH%
+  - SET COMPOSER_NO_INTERACTION=1
+  - SET PHP=1
+  - SET ANSICON=121x90 (121x90)
 
 ## Install PHP and composer, and run the appropriate composer command
 install:
-    - IF EXIST c:\tools\php (SET PHP=0)
-    - ps: appveyor-retry cinst -y php  --ignore-checksums --version ((choco search php --exact --all-versions -r | select-string -pattern $Env:php_ver_target | Select-Object -first 1) -replace '[php|]','')
-    - cd c:\tools\php
-    - IF %PHP%==1 copy php.ini-production php.ini /Y
-    - IF %PHP%==1 echo date.timezone="UTC" >> php.ini
-    - IF %PHP%==1 echo extension_dir=ext >> php.ini
-    - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
-    - IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
-    - IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini
-    - IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
-    - appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
-    - cd c:\projects\php-project-workspace
-    - 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 show
+  - IF EXIST c:\tools\php (SET PHP=0)
+  - ps: appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
+  - cd c:\tools\php
+  - IF %PHP%==1 copy php.ini-production php.ini /Y
+  - IF %PHP%==1 echo date.timezone="UTC" >> php.ini
+  - IF %PHP%==1 echo extension_dir=ext >> php.ini
+  - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
+  - IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
+  - IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini
+  - 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 show
 
 ## Run the actual test
 test_script:
-    - cd c:\projects\php-project-workspace
-    - vendor/bin/phpunit -c phpunit.xml.dist
+  - cd c:\projects\php-project-workspace
+  - vendor/bin/phpunit -c phpunit.xml.dist

composer.json

@@ -13,10 +13,11 @@
     }
   ],
   "require": {
-    "php": "^7.0",
+    "php": "^7.2",
     "api-clients/middleware": "^4.0"
   },
   "require-dev": {
+    "api-clients/cs-fixer-config": "^1.1",
     "api-clients/test-utilities": "^4.3.0",
     "ringcentral/psr7": "^1.2"
   },
@@ -33,14 +34,18 @@
   "config": {
     "sort-packages": true,
     "platform": {
-      "php": "7.0.9"
+      "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",
@@ -70,9 +75,9 @@
       "@unit"
     ],
     "qa-ci": [
-      "@qa-all"
+      "@unit"
     ],
-    "qa-ci-coverage": [
+    "qa-ci-extended": [
       "@qa-all-coverage"
     ],
     "qa-ci-windows": [

composer.lock

@@ -2,7 +2,6 @@
 
 namespace ApiClients\Middleware\PersonalAuthorization;
 
-use ApiClients\Foundation\Middleware\DefaultPriorityTrait;
 use ApiClients\Foundation\Middleware\ErrorTrait;
 use ApiClients\Foundation\Middleware\MiddlewareInterface;
 use ApiClients\Foundation\Middleware\PostTrait;
@@ -19,8 +18,8 @@ class PersonalAuthorizationHeaderMiddleware implements MiddlewareInterface
     use ErrorTrait;
 
     /**
-     * @param RequestInterface $request
-     * @param array $options
+     * @param  RequestInterface            $request
+     * @param  array                       $options
      * @return CancellablePromiseInterface
      */
     public function pre(