Merge branch 'Nyholm-patch-1' into 3.1

Closes #3292
This commit is contained in:
Simon Welsh 2014-08-18 21:16:51 +10:00
commit d2c828678a

View File

@ -2,6 +2,10 @@ language: php
php:
- 5.3
- 5.4
- 5.5
- 5.6
- hhvm-nightly
env:
global:
@ -13,6 +17,8 @@ env:
- DB=MYSQL CORE_RELEASE=3.1
matrix:
allow_failures:
- php: hhvm-nightly
include:
- php: 5.3
env: DB=PGSQL CORE_RELEASE=3.1
@ -26,6 +32,7 @@ matrix:
env: DB=MYSQL CORE_RELEASE=3.1
- php: 5.4
env: DB=MYSQL CORE_RELEASE=3.1 BEHAT_TEST=1
before_script:
- composer self-update
- phpenv rehash