From 2a753474d018f708e5595f6538f5d44c054ae21e Mon Sep 17 00:00:00 2001
From: John Fitzpatrick <j13k@users.noreply.github.com>
Date: Wed, 6 Mar 2019 13:39:47 +1100
Subject: [PATCH 1/2] Update ThreeWayMerge.php

Fixed bug/typo: equality check was used instead of assignment
---
 src/ThreeWayMerge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ThreeWayMerge.php b/src/ThreeWayMerge.php
index ce7ff0b..7a55f77 100755
--- a/src/ThreeWayMerge.php
+++ b/src/ThreeWayMerge.php
@@ -173,7 +173,7 @@ protected function linesAddedOrModified(
         // We will make sure they are same or throw exception.
         for ($i = $count_ancestor; $i < $count; $i++) {
             if ($count_ancestor == $count_remote) {
-                $merged[$i] == $local[$i];
+                $merged[$i] = $local[$i];
             } elseif ($count_ancestor == $count_local) {
                 $merged[$i] = $remote[$i];
             } elseif ($count_local == $count_remote) {

From 1c6f66107a3bdb6d92ff5fa652dcb27beb66457c Mon Sep 17 00:00:00 2001
From: John Fitzpatrick <j13k@users.noreply.github.com>
Date: Wed, 6 Mar 2019 14:11:33 +1100
Subject: [PATCH 2/2] Update .travis.yml

* Added 7.2 to PHP versions under test
* Set PHP_CodeSniffer version to latest v2 series, as v3 is not yet supported by Phing
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 91b05bc..8c3d10b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.2
   - hhvm
 
 matrix:
@@ -16,7 +17,7 @@ before_install:
   - composer selfupdate
   - pear channel-discover pear.phing.info
   - pear install phing/phing
-  - pear install pear/PHP_CodeSniffer
+  - pear install pear/PHP_CodeSniffer-2.9.1
   - phpenv rehash
 
 install: