Merge 43b6bae011 into f2bb3f3b91

.travis.yml

@@ -1,25 +1,28 @@
 # See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
 
-language: php
-php:
- - 5.5
-
 sudo: false
 
+language: php
+
+php:
+  - 5.5
+  - 5.6
+  - 7.0
+
 env:
- - DB=MYSQL CORE_RELEASE=master
- - DB=PGSQL CORE_RELEASE=master
+  - DB=MYSQL CORE_RELEASE=4.0
 
 matrix:
   include:
     - php: 5.6
-      env: DB=MYSQL CORE_RELEASE=master
+      env: DB=PGSQL CORE_RELEASE=4.0
 
 before_script:
- - phpenv rehash
- - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
- - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
- - cd ~/builds/ss
+  - composer self-update || true
+  - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
+  - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
+  - cd ~/builds/ss
+  - composer install
 
 script:
- - phpunit translatable/tests/
+  - vendor/bin/phpunit silverstripe-translatable/tests