From 0a63a25b59d3bb57f118e2abb8719dd82b6084a5 Mon Sep 17 00:00:00 2001
From: Shudd3r <q3.shudder@gmail.com>
Date: Wed, 5 Feb 2020 13:41:39 +0100
Subject: [PATCH] Refactored scripts in .travis.yml

---
 .travis.yml | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f10b04f..bb4e79a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,32 +4,30 @@ php:
   - 7.4
 
 env:
-  - TEST_TYPE="cover" STABILITY="--prefer-stable"
-  - TEST_TYPE="style" STABILITY=""
+  - TEST_TYPE="cover" VER_PREFS="--prefer-lowest --prefer-stable" COVERAGE="--coverage-clover build/logs/clover.xml"
+  - TEST_TYPE="style" VER_PREFS="" COVERAGE="--no-coverage"
 
 before_install:
   - if [ "$TEST_TYPE" = "style" ]; then phpenv config-rm xdebug.ini; fi
   - composer self-update
 
 before_script:
-  - if [ "$TEST_TYPE" = "cover" ]; then composer require --dev --no-update php-coveralls/php-coveralls ^2.0; fi
-  - composer update $STABILITY
+  - composer update $VER_PREFS
   - |
-    run_tests() {
-      if [ "$TEST_TYPE" = "style" ]; then
-        vendor/bin/phpcs --extensions=php --standard=phpcs.xml.dist src
-        vendor/bin/phpcs --extensions=php --standard=phpcs.xml.dist --ignore=*/CodeSamples/* tests
-        vendor/bin/php-cs-fixer --dry-run -v --config=cs-fixer.php.dist --path-mode=intersection fix src
-        vendor/bin/php-cs-fixer --dry-run -v --config=cs-fixer.php.dist --path-mode=intersection fix tests
+    if [ "$TEST_TYPE" = "cover" ]; then
+      mkdir -p build/logs
+      composer require --dev php-coveralls/php-coveralls ^2.0
+    fi
 
-        vendor/bin/phpunit --exclude-group integrated --no-coverage
-      else
-        mkdir -p build/logs
-        vendor/bin/phpunit --exclude-group integrated --coverage-clover build/logs/clover.xml
-      fi
-    }
 script:
-  - run_tests
+  - |
+    if [ "$TEST_TYPE" = "style" ]; then
+      vendor/bin/phpcs --extensions=php --standard=phpcs.xml.dist src || travis_terminate 1
+      vendor/bin/phpcs --extensions=php --standard=phpcs.xml.dist --ignore=*/CodeSamples/* tests || travis_terminate 1
+      vendor/bin/php-cs-fixer --dry-run -v --config=cs-fixer.php.dist --path-mode=intersection fix src || travis_terminate 1
+      vendor/bin/php-cs-fixer --dry-run -v --config=cs-fixer.php.dist --path-mode=intersection fix tests || travis_terminate 1
+    fi
+  - vendor/bin/phpunit --exclude-group integrated $COVERAGE
 
 after_success:
   - if [ "$TEST_TYPE" = "cover" ]; then vendor/bin/php-coveralls; fi