From 6d20f32b851683976bfb69cf913692737931004a Mon Sep 17 00:00:00 2001
From: Mikey O'Toole <mikey@mjco.uk>
Date: Mon, 1 Jun 2020 21:50:24 +0100
Subject: [PATCH 1/3] Update/Fix CI config

---
 .travis.yml | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 92ccd8c..068b420 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,21 @@
+sudo: false
 language: php
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - nightly
+matrix:
+  fast_finish: true
+  allow_failures:
+    - php: nightly
+  include:
+  - php: 5.4
+    dist: trusty
+  - php: 5.5
+    dist: trusty
+  - php: 5.6
+  - php: 7.0
+  - php: 7.1
+  - php: 7.2
+  - php: 7.3
+  - php: 7.4
+  - php: nightly
 install:
   - pear install package.xml
 script: pear run-tests tests/

From baf8b9e601939d5bd14188a1ad1b60754e41cf05 Mon Sep 17 00:00:00 2001
From: Mikey O'Toole <mikey@mjco.uk>
Date: Mon, 1 Jun 2020 22:01:40 +0100
Subject: [PATCH 2/3] Update .travis.yml

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

diff --git a/.travis.yml b/.travis.yml
index 068b420..1aa5a70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-sudo: false
 language: php
 matrix:
   fast_finish: true

From 915e0609ec61a3224bc8a0e96617a830d6b77ec0 Mon Sep 17 00:00:00 2001
From: Mikey O'Toole <mikey@mjco.uk>
Date: Mon, 1 Jun 2020 22:39:06 +0100
Subject: [PATCH 3/3] Fix test failure on Nightly PHP builds.

This resolves the current test failure on PHP8.0.0-dev (Nightly!) which is:

`Fatal error: Uncaught Error: Non-static method Log::priorityToString() cannot be called statically in tests/composite.php:19`
---
 tests/composite.phpt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/composite.phpt b/tests/composite.phpt
index b7adff8..9f8a64c 100644
--- a/tests/composite.phpt
+++ b/tests/composite.phpt
@@ -21,7 +21,8 @@ function printIdents($children) {
 }
 
 function testPriority($composite, $priority) {
-    $name = Log::priorityToString($priority);
+    $log = new Log;
+    $name = $log->priorityToString($priority);
     $success = $composite->log($name, $priority);
     echo "$name : " . (($success) ? 'GOOD' : 'BAD') . "\n";
 }