From e6ec5fa22a7b9e61670a24d07b3119aff80dcd89 Mon Sep 17 00:00:00 2001
From: Brown <github@muglug.com>
Date: Fri, 7 Feb 2020 12:15:50 -0500
Subject: [PATCH] Simplify

---
 .travis.yml | 48 ++++++++++++++++++++----------------------------
 1 file changed, 20 insertions(+), 28 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 80258b4f9..86d2e14c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,12 @@
 dist: xenial
 language: php
 
-stages:
-  - Code style analysis
-  - test
-  - Phar build
-  # - Code coverage analysis
-
-php:
-  - 7.1.3
-  - 7.2
-  - 7.3
-  - 7.4
-  - nightly
-
 env:
   global:
     - DEFAULT_COMPOSER_FLAGS="--no-interaction --no-suggest --prefer-source"
     - XDEBUG="false"
     # generated with travis encrypt -r vimeo/psalm --org GITHUB_TOKEN="<secret oauth token>"
     - secure: Ayjp10v6IWeJX3ThWvPxlv0gkuTuvu30lsdQCjop+vS0Kv+6/IEOdSOxtm0tEWacq9EFCViWRKh9zxiwPtoi0wxGdzGGws+UtIJxew6Vy8HDCEH8nY4k50eElKUWI4YhVbiSdZEZ+Bd9kO0qGEBH9iWh8Tc8MP2Hklx7lOf+zUTSm8vpv+idcCxwGCvQMaMc5NhfnkgGq95/UU3iOvCi5/wkIFnSnoccxmZE2zsxI1e355ipa0uoe8/Ml6vK0NrZ0aBZwZfItsIuhRcL4Cm5kyar+Ao/mn9Zw8CHbfESrIMomRI7ZxwPNFj+sR/wCvEasIGHRxH8B9F4d8SmAoHR1CrmM/zyWRon73CfRb56M4VGG1hyqTr1GYHpBgZKSOYA8TKyOjD8EHGvevfHpJoGVNxf0+vAfdizlVJvkYhzSz/VjpOZO8rfOct4deNcpCVuVGg5uOGeg5P7coVniGHLHTm3JozK9Ia+ZLePtr3l/NuoW5dXVF1fdroCyQS2X0VSXALnnTPzcIQYsmpCk8yJ8uXorxj4dJHhstyll1jemJjxT7HJ1ASPUOTsPu9u9EoBDHQxOGa5b2/7chyV+EhrYV899RKZ4xEPzpC619sWgtZJci3oLcebU1BY42pIr94UqtwcJKhriwV72VpKvCG/eqOKLhXq355TYRx2dK05a5w=
-  jobs:
-    - DEPS="high"
-    - DEPS="low"
 
 cache:
   directories:
@@ -48,30 +32,38 @@ script:
   - vendor/bin/phpunit
   - ./psalm
 
-# Base test matrix (php/env)
-matrix:
-  fast_finish: true
-  allow_failures:
-    - php: nightly
-
 # Additional stages
 jobs:
+  fast_finish: true
   include:
-    - stage: Code style analysis
-      php: 7.3
+    - php: 7.1.3
+      env: DEPS="low"
+
+    - php: 7.1.3
+      env: DEPS="high"
+
+    - php: 7.4
+      env: DEPS="low"
+
+    - php: 7.4
+      env: DEPS="high"
+
+    - php: nightly
+      env: DEPS="high"
+      allow_failures: true
+
+    - php: 7.3
       env: DEPS="high"
       script:
         - vendor/bin/phpcs
 
-    - stage: Ensure no transient used dependencies
-      php: 7.3
+    - php: 7.3
       env: DEPS="high"
       script:
         - composer require --dev maglnet/composer-require-checker:^2.0.0
         - ./vendor/bin/composer-require-checker check --config-file=bin/composer-require-checker-config.json ./composer.json
 
-    - stage: Phar build
-      php: 7.3
+    - php: 7.3
       env: DEPS="high"
       script: bin/build-phar.sh
       deploy: