Updated QA settings for 5.1 test utilities

Author: WyriHaximus

Diff for: .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)
+    ;
+})();

Diff for: .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;

Diff for: 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
 

Diff for: appveyor.yml

@@ -7,19 +7,13 @@ 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 bits
+## Cache composer file
 cache:
     - '%LOCALAPPDATA%\Composer\files -> composer.lock'
 
@@ -33,7 +27,7 @@ init:
 ## 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 --version ((choco search php --exact --all-versions -r | select-string -pattern $Env:php_ver_target | Select-Object -first 1) -replace '[php|]','')
+    - 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
@@ -44,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

Diff for: composer.json

@@ -27,13 +27,20 @@
     }
   },
   "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",
@@ -63,9 +70,9 @@
       "@unit"
     ],
     "qa-ci": [
-      "@qa-all"
+      "@unit"
     ],
-    "qa-ci-coverage": [
+    "qa-ci-extended": [
       "@qa-all-coverage"
     ],
     "qa-ci-windows": [

Diff for: composer.lock

@@ -13,20 +13,21 @@ abstract class AbstractException extends Exception
     private $response;
 
     /**
-     * @param ResponseInterface $response
-     * @return AbstractException
+     * @return ResponseInterface
      */
-    protected function setResponse(ResponseInterface $response): AbstractException
+    public function getResponse(): ResponseInterface
     {
-        $this->response = $response;
-        return $this;
+        return $this->response;
     }
 
     /**
-     * @return ResponseInterface
+     * @param  ResponseInterface $response
+     * @return AbstractException
      */
-    public function getResponse(): ResponseInterface
+    protected function setResponse(ResponseInterface $response): AbstractException
     {
-        return $this->response;
+        $this->response = $response;
+
+        return $this;
     }
 }

Diff for: src/AbstractException.php

@@ -2,23 +2,21 @@
 
 namespace ApiClients\Tools\Psr7\HttpStatusExceptions;
 
-use ApiClients\Tools\Psr7\HttpStatusExceptions\Unofficial;
 use Exception as CoreException;
 use Psr\Http\Message\ResponseInterface;
-use function React\Promise\reject;
 
 final class ExceptionFactory
 {
     const STATUS_CODE_EXCEPTION_MAP = [
         /**
-         * 1xx codes
+         * 1xx codes.
          */
         100 => ContinueException::class,
         101 => SwitchingProtocolsException::class,
         102 => ProcessingException::class,
 
         /**
-         * 2xx codes
+         * 2xx codes.
          */
         200 => OKException::class,
         201 => CreatedException::class,
@@ -32,7 +30,7 @@ final class ExceptionFactory
         226 => IMUsedException::class,
 
         /**
-         * 3xx codes
+         * 3xx codes.
          */
         300 => MultiChoicesException::class,
         301 => MovedPermanentlyException::class,
@@ -45,7 +43,7 @@ final class ExceptionFactory
         308 => PermanentRedirectException::class,
 
         /**
-         * 4xx codes
+         * 4xx codes.
          */
         400 => BadRequestException::class,
         401 => UnauthorizedException::class,
@@ -77,7 +75,7 @@ final class ExceptionFactory
         451 => UnavailableForLegalReasonsException::class,
 
         /**
-         * 5xx codes
+         * 5xx codes.
          */
         500 => InternalServerErrorException::class,
         501 => NotImplementedException::class,
@@ -92,15 +90,15 @@ final class ExceptionFactory
         511 => NetworkAuthenticationRequiredException::class,
 
         /**
-         * IIS (Unofficial)
+         * IIS (Unofficial).
          *
          * Excluding the 451 as it conflicts with the official 451 code.
          */
         440 => Unofficial\IIS\LoginTimeoutException::class,
         449 => Unofficial\IIS\RetryWithException::class,
 
         /**
-         * Cloudflare (Unofficial)
+         * Cloudflare (Unofficial).
          */
         520 => Unofficial\Cloudflare\UnknownErrorException::class,
         521 => Unofficial\Cloudflare\WebServerIsDownException::class,
@@ -115,6 +113,7 @@ final class ExceptionFactory
     public static function create(ResponseInterface $response, CoreException $previousException)
     {
         $exception = static::STATUS_CODE_EXCEPTION_MAP[$response->getStatusCode()];
+
         return $exception::create($response, $previousException);
     }
 }

Diff for: src/ExceptionFactory.php

@@ -3,8 +3,8 @@
 namespace ApiClients\Tests\Tools\Psr7\HttpStatusExceptions;
 
 use ApiClients\Tools\Psr7\HttpStatusExceptions;
-use Exception as CoreException;
 use ApiClients\Tools\TestUtilities\TestCase;
+use Exception as CoreException;
 use Psr\Http\Message\ResponseInterface;
 use RingCentral\Psr7\Response;
 
@@ -17,20 +17,6 @@ public function provideExceptions()
         }
     }
 
-    private function createDataSet(int $code, string $exception)
-    {
-        $previousException = new CoreException('foo.bar');
-        $response = new Response($code);
-        $expectedException = $exception::create($response, $previousException);
-        return [
-            $code,
-            $exception,
-            $response,
-            $previousException,
-            $expectedException,
-        ];
-    }
-
     /**
      * @dataProvider provideExceptions
      */
@@ -51,4 +37,19 @@ public function testCreate(
         self::assertInstanceOf(ResponseInterface::class, $result->getResponse());
         self::assertEquals($response, $result->getResponse());
     }
+
+    private function createDataSet(int $code, string $exception)
+    {
+        $previousException = new CoreException('foo.bar');
+        $response = new Response($code);
+        $expectedException = $exception::create($response, $previousException);
+
+        return [
+            $code,
+            $exception,
+            $response,
+            $previousException,
+            $expectedException,
+        ];
+    }
 }