From f2089fe3f4dd55d2286a474dbe7b65c4c0e99bcf Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <daniel@handbuilt.co>
Date: Mon, 28 Oct 2019 06:29:55 -0700
Subject: [PATCH 1/4] Update build matrix to include PHP 7.4

---
 .travis.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eb3b9395..27b8363d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,14 +22,20 @@ cache:
 
 matrix:
   include:
+    - php: 7.4
+      env: WP_VERSION=nightly
     - php: 7.3
       env: WP_VERSION=latest
+    - php: 7.3
+      env: WP_TRAVISCI=phpcs
+    - php: 7.3
+      env: WP_TRAVISCI=nightly
     - php: 7.2
       env: WP_VERSION=latest
-    - php: 7.2
-      env: WP_VERSION=trunk
-    - php: 7.2
-      env: WP_TRAVISCI=phpcs
+    - php: 7.1
+      env: WP_VERSION=latest
+    - php: 7.1
+      env: WP_VERSION=4.6
 
 before_script:
   - export PATH="$HOME/.composer/vendor/bin:$PATH"

From d4df5debe4713afa340ef989706c3c86406f7204 Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <daniel@handbuilt.co>
Date: Mon, 28 Oct 2019 06:34:00 -0700
Subject: [PATCH 2/4] PHP 7.4 build is `7.4snapshot`

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

diff --git a/.travis.yml b/.travis.yml
index 27b8363d..47efefad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ cache:
 
 matrix:
   include:
-    - php: 7.4
+    - php: 7.4snapshot
       env: WP_VERSION=nightly
     - php: 7.3
       env: WP_VERSION=latest

From a3c8e1738b42822b6677895b20053b553ba0296e Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <daniel@handbuilt.co>
Date: Mon, 28 Oct 2019 08:10:25 -0700
Subject: [PATCH 3/4] Try testing against WP 4.7 because 4.6 has unexpected
 test suite fail

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

diff --git a/.travis.yml b/.travis.yml
index 47efefad..35811fd1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ matrix:
     - php: 7.1
       env: WP_VERSION=latest
     - php: 7.1
-      env: WP_VERSION=4.6
+      env: WP_VERSION=4.7
 
 before_script:
   - export PATH="$HOME/.composer/vendor/bin:$PATH"

From 448103a4151ec365c90fd147fb5d45061e5c4ac3 Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <daniel@handbuilt.co>
Date: Mon, 28 Oct 2019 08:24:21 -0700
Subject: [PATCH 4/4] WP 4.8 is earliest PHPUnit 6 support
 https://core.trac.wordpress.org/ticket/39822

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

diff --git a/.travis.yml b/.travis.yml
index 35811fd1..23f8eeaf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ matrix:
     - php: 7.1
       env: WP_VERSION=latest
     - php: 7.1
-      env: WP_VERSION=4.7
+      env: WP_VERSION=4.8
 
 before_script:
   - export PATH="$HOME/.composer/vendor/bin:$PATH"