Merge pull request #8 from ivailo-stoianov/master

Upgrade AppVeyor config

Author: WyriHaximus

appveyor.bat

@@ -0,0 +1,9 @@
+cd c:\tools\php
+copy php.ini-production php.ini /Y
+echo date.timezone="UTC" >> php.ini
+echo extension_dir=ext >> php.ini
+echo extension=php_openssl.dll >> php.ini
+echo extension=php_mbstring.dll >> php.ini
+echo extension=php_fileinfo.dll >> php.ini
+echo @php %%~dp0composer.phar %%* > composer.bat
+appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar

appveyor.yml

@@ -1,50 +1,44 @@
 build: false
 platform:
   - x64
-clone_folder: c:\projects\php-api-client
+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: current
+    php_ver_target: 7.0
   - dependencies: highest
+    php_ver_target: 7.0
 
 ## Cache composer bits
 cache:
-    - c:\tools\php -> appveyor.yml
-    - c:\projects\php-api-client\vendor -> composer.lock
+    - C:\ProgramData\chocolatey\bin -> appveyor.yml
+    - C:\ProgramData\chocolatey\lib -> appveyor.yml
+    - C:\tools\php -> appveyor.yml
     - '%LOCALAPPDATA%\Composer\files -> composer.lock'
 
 ## 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:
-    - IF EXIST c:\tools\php (SET PHP=0)
-    - IF %PHP%==1 cinst -y OpenSSL.Light
-    - IF %PHP%==1 cinst -y 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 DownloadFile https://getcomposer.org/composer.phar
-    - cd c:\projects\php-api-client
-    - IF %dependencies%==lowest composer update --prefer-lowest --no-progress -n
-    - IF %dependencies%==current composer install --no-progress
-    - IF %dependencies%==highest composer update --no-progress -n
-    - composer show -i
+    - 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'}
+    - 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
+    - composer show
 
 ## Run the actual test
 test_script:
-    - cd c:\projects\php-api-client
-    - composer qa-ci-windows
+    - cd c:\projects\php-project-workspace
+    - vendor/bin/phpunit -c phpunit.xml.dist