From e1a0c1fc49fd5e9759cacadbec7d0cb7a497e2fc Mon Sep 17 00:00:00 2001
From: Richard Bairwell <richard@bairwell.com>
Date: Thu, 31 Dec 2015 15:56:59 +0000
Subject: [PATCH] Still working on travis configuration

---
 .travis.yml | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 066aa19..accb0c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,19 +11,15 @@ matrix:
   allow_failures:
     - php: nightly
 
-before_install:
-  - composer self-update
 
-install: composer update $COMPOSER_FLAGS
-
-before_script:
-  - if [[ "$TRAVIS_PHP_VERSION" == '5.6' ]]; then composer require satooshi/php-coveralls:dev-master squizlabs/php_codesniffer:2.* -n ; fi
-  - if [[ "$TRAVIS_PHP_VERSION" != '5.6' ]]; then composer install -n ; fi
+install:
+  - composer install -n
+  - composer require --dev satooshi/php-coveralls -n
 
 script:
-  - if [[ "$TRAVIS_PHP_VERSION" == '5.6' ]]; then mkdir -p build/logs && phpunit --coverage-clover build/logs/clover.xml ; fi
-  - if [[ "$TRAVIS_PHP_VERSION" != '5.6' ]]; then phpunit ; fi
-  - if [[ "$TRAVIS_PHP_VERSION" == '5.6' ]]; then vendor/bin/phpcs --ignore=vendor/* -n -p . ; fi
+  mkdir -p build/logs
+  phpunit --coverage-clover build/logs/clover.xml
+  vendor/bin/phpcs
 
-after_script:
-  - if [[ "$TRAVIS_PHP_VERSION" == '5.6' ]]; then php vendor/bin/coveralls -v ; fi
+after_success:
+  - travis_retry php vendor/bin/coveralls -v