From 7ee3a92a28a62598ae3d60222e48f2581fcfe5f2 Mon Sep 17 00:00:00 2001
From: johnstevenson <john-stevenson@blueyonder.co.uk>
Date: Mon, 18 Dec 2017 21:23:46 +0000
Subject: [PATCH] Modularize appveyor.yml and use Composer-Setup

---
 appveyor.yml | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index c9a2c19ee..855601d23 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,28 +3,29 @@ clone_depth: 5
 platform:
   - x86
   - x64
-clone_folder: c:\projects\composer
+
+environment:
+  PHP_CHOCO_VERSION: 7.2.0
+  PHP_CACHE_DIR: C:\tools\php
 
 cache:
-  - c:\tools\php -> appveyor.yml
+  - '%PHP_CACHE_DIR% -> appveyor.yml'
 
 init:
-  - SET PATH=c:\tools\php;%PATH%
+  - SET PATH=%PHP_CACHE_DIR%;%PATH%
   - SET COMPOSER_NO_INTERACTION=1
-  - SET PHP=1
+  - SET PHP=0
   - SET ANSICON=121x90 (121x90)
 
 install:
-  - IF EXIST c:\tools\php (SET PHP=0)
-  - IF %PHP%==1 cinst -y php --params "/InstallDir:c:\tools\php"
-  - cd c:\tools\php
-  - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
-  - IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
-  - IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
-  - appveyor DownloadFile https://getcomposer.org/composer.phar
-  - cd c:\projects\composer
+  - IF EXIST %PHP_CACHE_DIR% (SET PHP=1)
+  - IF %PHP%==0 cinst php -y --version %PHP_CHOCO_VERSION%  --params "/InstallDir:%PHP_CACHE_DIR%"
+  - IF %PHP%==0 cinst composer -y --ia "/DEV=%PHP_CACHE_DIR%"
+  - php -v
+  - IF %PHP%==0 (composer --version) ELSE (composer self-update)
+  - cd %APPVEYOR_BUILD_FOLDER%
   - composer install --prefer-dist --no-progress
 
 test_script:
-  - cd c:\projects\composer
-  - vendor/bin/phpunit --colors=always
+  - cd %APPVEYOR_BUILD_FOLDER%
+  - vendor\bin\phpunit --colors=always