From 3f5bfc884a9659d0fbdf313ec0649f6e59fb38e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 26 Mar 2014 14:18:32 +0100
Subject: [PATCH] Merge conditions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7b17b6b2b9..cd8fed7054 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,13 +17,13 @@ before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq ant
 before_script:
-  - if [[ $TRAVIS_PHP_VERSION != "hhvm" -a -z "$LINT" ]] ; then
+  - if [[ -z "$LINT" ]] ; then
+    if [[ $TRAVIS_PHP_VERSION != "hhvm" ]] ; then
     git clone git://github.com/zenovich/runkit.git && cd runkit && phpize && ./configure && make && make install && cd .. ;
     phpenv config-add test/travis.php.ini ;
     pear channel-discover pear.phpunit.de ;
     pear install phpunit/PHPUnit_Selenium ;
     fi
-  - if [[ -z "$LINT" ]] ; then
     composer install --dev --no-interaction ;
     fi
 script: