Bumped to PHP 7.2 and applied new CS rules

Author: WyriHaximus

.php_cs

@@ -1,14 +1,14 @@
 <?php declare(strict_types=1);
 
-use ApiClients\Tools\TestUtilities\PhpCsFixerConfig;
+use ApiClients\Tools\CsFixerConfig\PhpCsFixerConfig;
 use PhpCsFixer\Config;
 
 return (function (): Config
 {
     $paths = [
+        __DIR__ . DIRECTORY_SEPARATOR . 'examples',
         __DIR__ . DIRECTORY_SEPARATOR . 'src',
         __DIR__ . DIRECTORY_SEPARATOR . 'tests',
-        __DIR__ . DIRECTORY_SEPARATOR . 'examples',
     ];
 
     return PhpCsFixerConfig::create()

.travis.yml

@@ -1,42 +1,62 @@
 language: php
-sudo: false
 
 ## Cache composer bits
 cache:
   directories:
     - $HOME/.composer/cache/files
 
-## PHP versions we test against
-php:
-  - 7.0
-  - 7.1
-  - nightly
-
 ## 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: 7.3
+      env:
+        - dropPlatform=false
+    - php: nightly
+      env:
+        - dropPlatform=false
+    - php: 7.2
+      env:
+        - dependencies=lowest
+        - dropPlatform=false
+    - php: 7.3
+      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: 7.3
+      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

@@ -30,3 +30,6 @@ unit-coverage:
 
 ci-coverage: init
 	composer ci-coverage
+
+generate-resources: init
+	./vendor/bin/api-client-resource-generator ./resources.yml

appveyor.yml

@@ -0,0 +1,50 @@
+build: false
+platform:
+  - x64
+clone_folder: c:\projects\php-project-workspace
+
+## Build matrix for lowest and highest possible targets
+environment:
+  matrix:
+    - dependencies: lowest
+      php_ver_target: 7.2
+    - dependencies: current
+      php_ver_target: 7.2
+    - dependencies: highest
+      php_ver_target: 7.2
+
+## Cache composer file
+cache:
+  - '%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)
+
+## Install PHP and composer, and run the appropriate composer command
+install:
+  - 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

composer.json

@@ -8,12 +8,13 @@
         }
     ],
     "require": {
-        "php": "^7.0",
+        "php": "^7.2",
         "react/promise": "^2.5",
         "wyrihaximus/react-child-process-closure": "^1.0"
     },
     "require-dev": {
-        "api-clients/test-utilities": "^4.1"
+        "api-clients/cs-fixer-config": "^1.1",
+        "api-clients/test-utilities": "^5.2"
     },
     "autoload": {
         "psr-4": {
@@ -29,7 +30,7 @@
     "config": {
         "sort-packages": true,
         "platform": {
-            "php": "7.0"
+            "php": "7.2"
         }
     },
     "scripts": {