Merge branch 'master' into qa-update-to-phpunit-6

Author: WyriHaximus

.travis.yml

@@ -6,40 +6,47 @@ cache:
   directories:
     - $HOME/.composer/cache/files
 
-## PHP versions we test against
+ ## PHP versions we test against for current composer dependancies
 php:
   - 7.0
   - 7.1
   - nightly
-  - hhvm
+## environment variables, one build is created for each
+env:
+  - dependencies=lowest
+  - dependencies=current
+  - dependencies=highest
 
-## Build matrix for lowest and highest possible targets
+## Build matrix for PHP versions we test against with lowest and highest possible targets
 matrix:
   include:
-    - php: 7.0
-      env: dependencies=lowest
-    - php: 7.1
-      env: dependencies=lowest
-    - php: nightly
-      env: dependencies=lowest
     - php: hhvm
+      sudo: true
+      dist: trusty
+      group: edge # until the next major travis stable update
       env: dependencies=lowest
-    - php: 7.0
-      env: dependencies=highest
-    - php: 7.1
-      env: dependencies=highest
-    - php: nightly
-      env: dependencies=highest
     - php: hhvm
+      sudo: true
+      dist: trusty
+      group: edge # until the next major travis stable update
+      env: dependencies=current
+    - php: hhvm
+      sudo: true
+      dist: trusty
+      group: edge # until the next major travis stable update
       env: dependencies=highest
   allow_failures:
     - php: hhvm
 
+before_install:
+  # Force hhvm PHP 7 mode
+  - if [[ $TRAVIS_PHP_VERSION = hhv* ]]; then echo hhvm.php7.all=1 >> /etc/hhvm/php.ini; fi
+
 ## Install or update dependencies
 install:
   #- composer validate
   - composer config --unset platform.php
-  - if [ -z "$dependencies" ]; then composer install --prefer-dist; fi;
+  - if [ "$dependencies" = "current" ]; 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

appveyor.yml

@@ -12,7 +12,7 @@ environment:
   - dependencies: highest
     php_ver_target: 7.0
   - dependencies: highest
-    php_ver_target: 7.0
+    php_ver_target: 7.1
 
 ## Cache composer bits
 cache:
@@ -47,4 +47,4 @@ install:
 ## 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