From 588b33abc63901027abb5224078e1f3f8edcab37 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 14 Sep 2017 01:34:10 +0200
Subject: [PATCH 1/2] Travis: run the build tests against PHP 7.2 as well

The new Trusty images as per Sept 7 include an image for PHP 7.2 (even though it hasn't been released yet) and nightly is now PHP 7.3-dev.
---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 5a8394f..575f248 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,8 @@ matrix:
       env: GTEPHPFIVEFOUR=1 SNIFF=1
     - php: '7.1'
       env: GTEPHPFIVEFOUR=1
+    - php: '7.2'
+      env: GTEPHPFIVEFOUR=1
     - php: 'hhvm'
       env: GTEPHPFIVEFOUR=1
     - php: 'nightly'

From 861566dea4863e22eb3ba48727e065a464f80d9b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 30 Nov 2017 22:01:20 +0100
Subject: [PATCH 2/2] Build: tweak PHPCS run

---
 .travis.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 575f248..83bbdff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,9 +30,9 @@ matrix:
     - php: '5.6'
       env: GTEPHPFIVEFOUR=1
     - php: '7.0'
-      env: GTEPHPFIVEFOUR=1 SNIFF=1
-    - php: '7.1'
       env: GTEPHPFIVEFOUR=1
+    - php: '7.1'
+      env: GTEPHPFIVEFOUR=1 SNIFF=1
     - php: '7.2'
       env: GTEPHPFIVEFOUR=1
     - php: 'hhvm'
@@ -53,8 +53,7 @@ before_install:
     # Install CodeSniffer for WordPress Coding Standards checks.
     - if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/squizlabs/PHP_CodeSniffer.git $PHPCS_DIR; fi
     # Install WordPress Coding Standards.
-    # Temporarily set to `develop` to benefit from PHPCS 3.x compatibility. Move back to `master` once released.
-    - if [[ "$SNIFF" == "1" ]]; then git clone -b develop --depth 1 https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git $WPCS_DIR; fi
+    - if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git $WPCS_DIR; fi
     # Install PHPCompatibility Standards in a subdirectory of WPCS so we only need to run installed_paths once.
     - if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/wimg/PHPCompatibility.git $PHPCOMPAT_DIR; fi
     # Hop into CodeSniffer directory.