diff --git a/.travis.yml b/.travis.yml index ae82c26e6..be8e77d61 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ php: - 5.4 - 5.5 - 5.6 - - 5.3.3 #This will actually use PHP7 + - 7.0 - hhvm - hhvm-nightly @@ -21,7 +21,7 @@ cache: - $HOME/.composer/cache before_install: - - ./travis/before_install.sh + - composer self-update install: - travis_retry ./travis/install.sh diff --git a/travis/after_script.sh b/travis/after_script.sh index c9a14085d..f1553ec50 100755 --- a/travis/after_script.sh +++ b/travis/after_script.sh @@ -1,6 +1,6 @@ #!/bin/bash -if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then +if [[ $TRAVIS_PHP_VERSION == "5.6" ]]; then vendor/bin/coveralls -v wget https://scrutinizer-ci.com/ocular.phar php ocular.phar code-coverage:upload --format=php-clover ./build/logs/clover.xml -fi \ No newline at end of file +fi diff --git a/travis/before_install.sh b/travis/before_install.sh deleted file mode 100755 index 72869405d..000000000 --- a/travis/before_install.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -if [[ "$TRAVIS_PHP_VERSION" == "5.3.3" ]]; then - pushd $HOME - git clone --depth 1 https://github.com/php/php-src.git - pushd php-src - ./buildconf -f - ./configure --with-curl --prefix=$HOME/.phpenv/versions/7 --quiet - make --quiet - make install - phpenv global 7 - popd - popd - echo Travis PHP Version is $TRAVIS_PHP_VERSION - wget http://getcomposer.org/composer.phar - mkdir $PWD/phar - mv composer.phar $PWD/phar/composer - chmod +x $PWD/phar/composer -else - composer self-update -fi \ No newline at end of file diff --git a/travis/before_script.sh b/travis/before_script.sh index 5e6b12dc9..102c39ad8 100755 --- a/travis/before_script.sh +++ b/travis/before_script.sh @@ -1,15 +1,11 @@ #!/bin/bash -if [[ "$TRAVIS_PHP_VERSION" != "hhvm" \ - && "$TRAVIS_PHP_VERSION" != "hhvm-nightly" \ - && "$TRAVIS_PHP_VERSION" != "5.3.3" ]]; then +if [[ $TRAVIS_PHP_VERSION != "hhvm" \ + && $TRAVIS_PHP_VERSION != "hhvm-nightly" \ + && $TRAVIS_PHP_VERSION != "7.0" ]]; then phpenv config-add ./travis/extra.ini phpenv rehash fi -if [[ "$TRAVIS_PHP_VERSION" == "5.3.3" ]]; then - php --version -fi - -if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then +if [[ $TRAVIS_PHP_VERSION == "5.6" ]]; then sed '/MockeryPHPUnitIntegration/d' -i ./phpunit.xml.dist -fi \ No newline at end of file +fi diff --git a/travis/install.sh b/travis/install.sh index bb38c9483..6ccf4cff7 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -1,11 +1,6 @@ #!/bin/bash -if [[ "$TRAVIS_PHP_VERSION" == "5.3.3" ]]; then - export PATH=$PWD/phar:$PATH - echo PATH is $PATH -fi - composer install -n -if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then +if [[ $TRAVIS_PHP_VERSION == "5.6" ]]; then composer require --dev satooshi/php-coveralls:~0.7@dev -fi \ No newline at end of file +fi diff --git a/travis/script.sh b/travis/script.sh index fd0c34cda..7ef810af3 100755 --- a/travis/script.sh +++ b/travis/script.sh @@ -1,8 +1,8 @@ #!/bin/bash -if [[ "$TRAVIS_PHP_VERSION" != "hhvm" && "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]]; then +if [[ $TRAVIS_PHP_VERSION != "hhvm" \ + && $TRAVIS_PHP_VERSION != "hhvm-nightly" \ + && $TRAVIS_PHP_VERSION != "7.0" ]]; then vendor/bin/phpunit --coverage-text --coverage-clover ./build/logs/clover.xml -fi - -if [[ "$TRAVIS_PHP_VERSION" == "hhvm" || "$TRAVIS_PHP_VERSION" == "hhvm-nightly" ]]; then +else vendor/bin/phpunit -fi \ No newline at end of file +fi