Merge pull request #445 from TomasVotruba/patch-2

travis: use directly PHP 7.0

.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

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
+fi

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
+fi

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
+fi

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
+fi