From 23c3a2d070f3e85c3d213a251d2cf35832e3a9d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 4 Dec 2014 13:58:22 +0100 Subject: [PATCH] Simplify if statements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0fe9982fde..f7de29fb8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,13 +29,13 @@ before_script: - export PATH=~/.composer/vendor/bin/:$PATH - mysql -uroot -e "SET PASSWORD = PASSWORD('$TESTSUITE_PASSWORD')" ; - composer install --dev --no-interaction - - set -e ; if [[ -z "$LINT" ]] ; then + - set -e ; if [ -z "$LINT" ] ; then - if [[ $TRAVIS_PHP_VERSION != "hhvm" ]] ; then + if [ $TRAVIS_PHP_VERSION != "hhvm" ] ; then git clone --depth=1 git://github.com/zenovich/runkit.git ; cd runkit ; - if [[ $TRAVIS_PHP_VERSION = "5.6" ]] ; then + if [ $TRAVIS_PHP_VERSION = "5.6" ] ; then wget https://github.com/zenovich/runkit/pull/71.diff ; patch -p1 < 71.diff ; fi ; @@ -51,7 +51,7 @@ before_script: fi ; - if [[ ! -z "$SELENIUM" ]] ; then + if [ ! -z "$SELENIUM" ] ; then php --server 127.0.0.1:8000 & @@ -66,11 +66,11 @@ before_script: script: - ant locales - - set -e; if [[ -z "$LINT" ]] ; then - if [[ $TRAVIS_PHP_VERSION == "hhvm" ]] ; then + - set -e; if [ -z "$LINT" ] ; then + if [ $TRAVIS_PHP_VERSION == "hhvm" ] ; then ant phpunit-hhvm ; else - if [[ ! -z "$SELENIUM" ]] ; then + if [ ! -z "$SELENIUM" ] ; then ant phpunit-nocoverage ; else ant phpunit ; @@ -81,8 +81,8 @@ script: fi after_script: - - if [[ -f build/logs/clover.xml ]] ; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml || true ; fi - - if [[ -f vendor/bin/coveralls ]] ; then php vendor/bin/coveralls -v || true ; fi + - if [ -f build/logs/clover.xml ] ; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml || true ; fi + - if [ -f vendor/bin/coveralls ] ; then php vendor/bin/coveralls -v || true ; fi matrix: allow_failures: