diff --git a/.travis.yml b/.travis.yml index f64701c364..7d410ee1d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,10 +49,10 @@ matrix: env: SYMFONY=2.7.* - php: '7.1' env: SYMFONY=2.8.* - - php: '7.1' - env: SYMFONY=3.1.* - php: '7.1' env: SYMFONY=3.2.* + - php: '7.1' + env: SYMFONY=3.3.* - php: '7.1' env: SYMFONY=dev-master@dev - php: '7.1' diff --git a/.travis/before_install_test.sh b/.travis/before_install_test.sh index b1ef671187..08059e7889 100755 --- a/.travis/before_install_test.sh +++ b/.travis/before_install_test.sh @@ -6,6 +6,13 @@ if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then TRAVIS_INI_FILE="$PHP_INI_DIR/travis.ini" echo "memory_limit=3072M" >> "$TRAVIS_INI_FILE" + if [ "$TRAVIS_PHP_VERSION" '<' '5.4' ]; then + XDEBUG_INI_FILE="$PHP_INI_DIR/xdebug.ini" + if [ -f "$XDEBUG_INI_FILE" ]; then + mv "$XDEBUG_INI_FILE" /tmp + fi + fi + fi sed --in-place "s/\"dev-master\":/\"dev-${TRAVIS_COMMIT}\":/" composer.json diff --git a/.travis/before_script_test.sh b/.travis/before_script_test.sh index e84a228da0..936d4f590a 100644 --- a/.travis/before_script_test.sh +++ b/.travis/before_script_test.sh @@ -1,2 +1,10 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash set -ev + +if [ "$TRAVIS_PHP_VERSION" != "hhvm" ] && [ "$TRAVIS_PHP_VERSION" '<' '5.4' ]; then + PHP_INI_DIR="$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/" + XDEBUG_INI_FILE="/tmp/xdebug.ini" + if [ -f "$XDEBUG_INI_FILE" ]; then + mv "$XDEBUG_INI_FILE" "$PHP_INI_DIR" + fi +fi