From 0ebfa6743397a75f5749c425140da42b89329859 Mon Sep 17 00:00:00 2001
From: Michele Locati <michele@locati.it>
Date: Thu, 1 Aug 2019 08:45:45 +0200
Subject: [PATCH 1/3] Fix TravisCI for 1.x

---
 .scrutinizer.yml |   8 +++
 .travis.yml      | 149 ++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 130 insertions(+), 27 deletions(-)
 create mode 100644 .scrutinizer.yml

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
new file mode 100644
index 0000000..939381f
--- /dev/null
+++ b/.scrutinizer.yml
@@ -0,0 +1,8 @@
+filter:
+  excluded_paths:
+    - 'documentation/*'
+    - 'tests/*'
+
+tools:
+    external_code_coverage:
+        runs: 1
diff --git a/.travis.yml b/.travis.yml
index 5bb3b98..6b0060a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,38 +6,133 @@ cache:
   directories:
     - $HOME/.composer/cache/files
 
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - hhvm
-
-env:
-  global:
-    - deps=high
-
 matrix:
+
   fast_finish: true
+
+  allow_failures:
+    - name: Test with PHP 7.4
+    - name: Test with PHP Nightly
+
   include:
-    - php: 5.3
+
+    - name: Test with PHP 5.3
+      dist: precise
+      php: '5.3'
+      before_script:
+        - phpenv config-rm xdebug.ini || true
+      install:
+        - composer update
+      script:
+        - composer test
+
+    - name: Test with PHP 5.3 (current dependencies)
       dist: precise
-    - php: 5.3
+      php: '5.3'
+      before_script:
+        - phpenv config-rm xdebug.ini || true
+      install:
+        - composer install
+      script:
+        - composer test
+
+    - name: Test with PHP 5.3 (lowest dependencies)
       dist: precise
-      env: deps=low
-    - php: 5.4
-      env: deps=no
-    - php: 5.5
-      env: deps=no
+      php: '5.3'
+      before_script:
+        - phpenv config-rm xdebug.ini || true
+      install:
+        - composer update --prefer-lowest
+      script:
+        - composer test
+
+    - name: Test with PHP 5.4
+      dist: trusty
+      php: '5.4'
+      before_script:
+        - phpenv config-rm xdebug.ini || true
+      install:
+        - composer update
+      script:
+        - composer test
+
+    - name: Test with PHP 5.5
+      dist: trusty
+      php: '5.5'
+      before_script:
+        - phpenv config-rm xdebug.ini || true
+      install:
+        - composer update
+      script:
+        - composer test
+
+    - name: Test with PHP 5.6
+      php: '5.6'
+      before_script:
+        - phpenv config-rm xdebug.ini || true
+      install:
+        - composer update
+      script:
+        - composer test
+
+    - name: Test with PHP 5.6 (current dependencies)
+      php: '5.6'
+      before_script:
+        - phpenv config-rm xdebug.ini || true
+      install:
+        - composer install
+      script:
+        - composer test
+
+    - name: Test with PHP 7.0
+      php: '7.0'
+      before_script:
+        - phpenv config-rm xdebug.ini || true
+      install:
+        - composer update
+      script:
+        - composer test
+
+    - name: Test with PHP 7.1
+      php: '7.1'
+      before_script:
+        - phpenv config-rm xdebug.ini || true
+      install:
+        - composer update
+      script:
+        - composer test
+
+    - name: Test with PHP 7.2 (with code coverage)
+      php: '7.2'
+      install:
+        - composer update
+      script:
+        - mkdir -p build/logs
+        - composer test -- --coverage-clover build/logs/clover.xml
 
-install:
-  - if [ "$deps" = "no" ]; then composer install; fi
-  - if [ "$deps" = "low" ]; then composer update --prefer-lowest; fi
-  - if [ "$deps" = "high" ]; then composer update; fi
+    - name: Test with PHP 7.3
+      php: '7.3'
+      before_script:
+        - phpenv config-rm xdebug.ini || true
+      install:
+        - composer update
+      script:
+        - composer test
 
-script:
- - mkdir -p build/logs
- - composer test -- --coverage-clover build/logs/clover.xml
+    - name: Test with PHP 7.4
+      php: '7.4snapshot'
+      before_script:
+        - phpenv config-rm xdebug.ini || true
+      install:
+        - composer update
+      script:
+        - composer test
 
+    - name: Test with PHP Nightly
+      php: nightly
+      before_script:
+        - phpenv config-rm xdebug.ini || true
+      install:
+        - composer update
+      script:
+        - composer test

From 37c3ce1cf6f2cd9a7fa0428e10cd3c406a7c1ef6 Mon Sep 17 00:00:00 2001
From: Michele Locati <michele@locati.it>
Date: Wed, 7 Aug 2019 15:34:43 +0200
Subject: [PATCH 2/3] Use --ignore-platform-reqs for PHP Nightly

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6b0060a..ae1670c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -133,6 +133,6 @@ matrix:
       before_script:
         - phpenv config-rm xdebug.ini || true
       install:
-        - composer update
+        - composer update --ignore-platform-reqs
       script:
         - composer test

From fd4e6e2e313e68cbd5792f7f3a09cd6a8d2a0c68 Mon Sep 17 00:00:00 2001
From: Michele Locati <michele@locati.it>
Date: Wed, 7 Aug 2019 15:35:46 +0200
Subject: [PATCH 3/3] Move code coverage job to 1st position

So that Scrutinizer receives data as soon as possible
---
 .travis.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ae1670c..81def35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,14 @@ matrix:
 
   include:
 
+    - name: Test with PHP 7.2 (with code coverage)
+      php: '7.2'
+      install:
+        - composer update
+      script:
+        - mkdir -p build/logs
+        - composer test -- --coverage-clover build/logs/clover.xml
+
     - name: Test with PHP 5.3
       dist: precise
       php: '5.3'
@@ -102,14 +110,6 @@ matrix:
       script:
         - composer test
 
-    - name: Test with PHP 7.2 (with code coverage)
-      php: '7.2'
-      install:
-        - composer update
-      script:
-        - mkdir -p build/logs
-        - composer test -- --coverage-clover build/logs/clover.xml
-
     - name: Test with PHP 7.3
       php: '7.3'
       before_script: