Merge branch 'master' into php5

* master:
  The HHVM environment does not know phpize, so we can not install extensions.
  Run travis tests on HipHop Virtual Machine (hhvm).
This commit is contained in:
Andreas Fischer 2014-01-22 04:16:42 +01:00
commit 52fa1df044

View File

@ -5,6 +5,7 @@ php:
- 5.3 - 5.3
- 5.4 - 5.4
- 5.5 - 5.5
- hhvm
env: env:
global: global:
@ -13,7 +14,7 @@ env:
- secure: "jtQTZKQBnzUlp/jz7NlM6470ZDnLGVAs53sgvIm4tcYqf9TWSXSXjIYvFsrS\nKPR2eyZaAevYysUkIGRFTUXTlG6tC36YngMp9+6FPxASl8mnGXsTbKcm613B\n59vD3242pgIgqhhmgFQ0c8gbvnE8PuF2aS4/hluP3r+AxhWN56E=" - secure: "jtQTZKQBnzUlp/jz7NlM6470ZDnLGVAs53sgvIm4tcYqf9TWSXSXjIYvFsrS\nKPR2eyZaAevYysUkIGRFTUXTlG6tC36YngMp9+6FPxASl8mnGXsTbKcm613B\n59vD3242pgIgqhhmgFQ0c8gbvnE8PuF2aS4/hluP3r+AxhWN56E="
before_script: before_script:
- travis/install-php-extensions.sh - sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then travis/install-php-extensions.sh; fi"
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' ]; then composer install --dev --no-interaction; fi" - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' ]; then composer install --dev --no-interaction; fi"
script: script: