Merge lint run into testsuite run

It should be faster to run these in parallel, but given limited amount
of workers, it's better to do more work in single run. The run takes
longer, but overall time to run all tests is lower due to less waiting
for free worker.

Signed-off-by: Michal Čihař <michal@cihar.com>

.travis.yml

@@ -17,7 +17,6 @@ sudo: false
 env:
   matrix:
     - PHPUNIT_ARGS="--exclude-group selenium"
-    - LINT="yes"
   global:
     - secure: "TR3s7lHkREN706g+FeNXl1S0R2fpcI1H+n8USIkl5WBd7S2/NpsZlSfkrgnC7/xRBDXzHwuYd8JQQyAZyrqPEeLqIqlKzxIcTHOiJWGeR/YO7JXsr1Slt/nFqygpIyz8yOh3QIvX6FMzPsamBlUNhRvTAkd2wXPMBpXQlhTVmX8="
     - TESTSUITE_BROWSERSTACK_USER=phpMyAdmin
@@ -29,12 +28,13 @@ before_script:
   - export PATH=~/.composer/vendor/bin/:$PATH
   - mysql -uroot -e "SET PASSWORD = PASSWORD('$TESTSUITE_PASSWORD')"
   - composer install --dev --no-interaction
-  - if [ -z "$LINT" -a $TRAVIS_PHP_VERSION != "hhvm" ] ; then ./test/install-runkit ; fi
-  - if [ -z "$LINT" -a -n "$SELENIUM" ] ; then ./test/install-browserstack ; fi
+  - if [ $TRAVIS_PHP_VERSION != "hhvm" ] ; then ./test/install-runkit ; fi
+  - if [ -n "$SELENIUM" ] ; then ./test/install-browserstack ; fi
 
 script:
   - ant locales
-  - set -e; if [ -z "$LINT" ] ; then
+  - ant lint
+  - set -e;
     if [ $TRAVIS_PHP_VERSION == "hhvm" ] ; then
     ant phpunit-hhvm ;
     else
@@ -43,9 +43,6 @@ script:
     else
     ant phpunit ;
     fi ;
-    fi ;
-    else
-    ant lint ;
     fi
 
 after_script: