Merge pull request #7 from php-api-clients/feature-error-handling-middlware

Error handling middlware

Author: WyriHaximus

appveyor.bat

@@ -3,42 +3,57 @@ 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.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
 
-## Cache composer bits
+## Cache composer, chocolatey and php bits
 cache:
-    - C:\ProgramData\chocolatey\bin -> appveyor.yml
-    - C:\ProgramData\chocolatey\lib -> appveyor.yml
-    - C:\tools\php -> appveyor.yml
     - '%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:
-    - SET COMPOSER_ROOT_VERSION=dev-master ## Temporary until we tag first versions
     - 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:
-    - ps: IF (!(Test-Path c:\tools\php)) {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|]',''); cmd.exe /c 'appveyor.bat'}
+    - 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
-    - IF %dependencies%==lowest appveyor-retry composer update --prefer-lowest --no-progress -n
-    - IF %dependencies%==current appveyor-retry composer install --no-progress
-    - IF %dependencies%==highest appveyor-retry composer update --no-progress -n
+    - 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
+    - vendor/bin/phpunit -c phpunit.xml.dist

appveyor.yml

@@ -11,7 +11,7 @@
   ],
   "require": {
     "php": "^7.0",
-    "api-clients/middleware": "^1.1",
+    "api-clients/middleware": "^2.0",
     "api-clients/resource": "^3.0",
     "api-clients/rx": "dev-master",
     "api-clients/service": "dev-master",
@@ -20,14 +20,12 @@
     "container-interop/container-interop": "^1.1",
     "daverandom/exceptional-json": "^1.0.1",
     "doctrine/annotations": "^1.2",
-    "joshdifabio/composed": "^1.0",
-    "ocramius/package-versions": "^1.1",
     "react/http-client": "^0.4.15",
     "react/promise": "^2.4",
     "wyrihaximus/ticking-promise": "^1.6"
   },
   "require-dev": {
-    "api-clients/test-utilities": "^2.0",
+    "api-clients/test-utilities": "^3.0.1",
     "php-di/php-di": "^5.4"
   },
   "suggest": {