Merge branch 'master' into php5

* master:
  Travis CI: Overwrite before_install step. Default currently fails on PHP 5.2.
  Travis CI: before_script should be install.
This commit is contained in:
Andreas Fischer 2014-08-04 13:13:40 +02:00
commit 4dde5b369c

View File

@ -16,7 +16,9 @@ env:
# the travis/code_coverage_id_rsa RSA private key.
- secure: "jtQTZKQBnzUlp/jz7NlM6470ZDnLGVAs53sgvIm4tcYqf9TWSXSXjIYvFsrS\nKPR2eyZaAevYysUkIGRFTUXTlG6tC36YngMp9+6FPxASl8mnGXsTbKcm613B\n59vD3242pgIgqhhmgFQ0c8gbvnE8PuF2aS4/hluP3r+AxhWN56E="
before_script:
before_install: true
install:
- travis/setup-secure-shell.sh
- sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then travis/install-php-extensions.sh; fi"
- sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then travis/setup-composer.sh; fi"