Merge branch 'master' into feature-imutable-client

Author: WyriHaximus

.styleci.yml

@@ -9,35 +9,54 @@ cache:
 ## PHP versions we test against
 php:
   - 7.0
-  - hhvm
+  - 7.1
+  - nightly
+
+## Environment variables
+env:
+  - coverage=true
 
 ## Build matrix for lowest and highest possible targets
 matrix:
   include:
     - php: 7.0
-      env: dependencies=lowest
-    - php: hhvm
-      env: dependencies=lowest
+      env:
+        - dependencies=lowest
+        - coverage=false
+    - php: 7.1
+      env:
+        - dependencies=lowest
+        - coverage=false
+    - php: nightly
+      env:
+        - dependencies=lowest
+        - coverage=false
     - php: 7.0
-      env: dependencies=highest
-    - php: hhvm
-      env: dependencies=highest
-  allow_failures:
-    - php: hhvm
-
-## Update composer and configure authentication token
-before_install:
-  - composer self-update
+      env:
+        - dependencies=highest
+        - coverage=false
+    - php: 7.1
+      env:
+        - dependencies=highest
+        - coverage=false
+    - php: nightly
+      env:
+        - dependencies=highest
+        - coverage=false
 
 ## Install or update dependencies
 install:
+  - composer validate
+  - if [ "$coverage" = "false" ]; 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: make travis
+script:
+  - if [ "$coverage" = "false" ]; then make ci; fi;
+  - if [ "$coverage" = "true" ]; then make ci-with-coverage; fi;
 
 ## Gather coverage and set it to coverage servers
-after_script: make travis-coverage
+after_script: make ci-coverage

.travis.yml

@@ -0,0 +1,55 @@
+build: false
+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:
+    - '%LOCALAPPDATA%\Composer\files -> composer.lock'
+
+## Set up environment varriables
+init:
+    - 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)
+    - 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|]','')
+    - 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 --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

appveyor.yml

@@ -1,5 +1,6 @@
 {
     "name": "api-clients/twitter",
+    "description": "Async first twitter client",
     "license": "MIT",
     "minimum-stability": "dev",
     "prefer-stable": true,