Merge pull request #24 from php-api-clients/dependabot/composer/api-clients/test-utilities-5.4.0

Bump api-clients/test-utilities from 3.0.1 to 5.4.0

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',
+        __DIR__ . DIRECTORY_SEPARATOR . 'examples',
+    ];
+
+    return PhpCsFixerConfig::create()
+        ->setFinder(
+            PhpCsFixer\Finder::create()
+                ->in($paths)
+                ->append($paths)
+        )
+        ->setUsingCache(false)
+    ;
+})();

.travis.yml

@@ -1,62 +1,62 @@
 language: php
-sudo: false
 
 ## Cache composer bits
 cache:
   directories:
-    - $HOME/.composer/cache
-
-## PHP versions we test against
-php:
-  - 7.2
-  - 7.3
-  - nightly
-
-## Environment variables
-env:
-  - coverage=true
+    - $HOME/.composer/cache/files
 
 ## Build matrix for lowest and highest possible targets
 matrix:
   include:
+    - 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
-        - coverage=false
+        - dropPlatform=false
     - php: 7.3
       env:
         - dependencies=lowest
-        - coverage=false
+        - dropPlatform=false
     - php: nightly
       env:
         - dependencies=lowest
-        - coverage=false
+        - dropPlatform=false
     - php: 7.2
       env:
         - dependencies=highest
-        - coverage=false
+        - dropPlatform=false
     - php: 7.3
       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,8 +19,8 @@ init:
 cs:
 	composer cs
 
-benchmark:
-	composer benchmark
+cs-fix:
+	composer cs-fix
 
 unit:
 	composer run-script unit --timeout=0

composer.json

@@ -16,7 +16,7 @@
     "psr/http-message": "^1.0"
   },
   "require-dev": {
-    "api-clients/test-utilities": "^3.0.1",
+    "api-clients/test-utilities": "^3.0.1 || ^5.0.0",
     "ringcentral/psr7": "^1.2"
   },
   "autoload": {
@@ -39,7 +39,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",
@@ -53,10 +57,6 @@
       "@ensure-installed",
       "parallel-lint --exclude vendor ."
     ],
-    "benchmark": [
-      "@ensure-installed",
-      "php examples/benchmark.php"
-    ],
     "qa-all": [
       "@lint-php",
       "@cs",
@@ -73,16 +73,13 @@
       "@unit"
     ],
     "qa-ci": [
-      "@qa-all",
-      "@benchmark"
+      "@unit"
     ],
-    "qa-ci-coverage": [
-      "@qa-all-coverage",
-      "@benchmark"
+    "qa-ci-extended": [
+      "@qa-all-coverage"
     ],
     "qa-ci-windows": [
-      "@qa-windows",
-      "@benchmark"
+      "@qa-windows"
     ],
     "qa-contrib": [
       "@qa-all"