From 24003deafa91dd4650ac6994b60dc1998633a80a Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Thu, 28 Feb 2019 11:38:43 -0700
Subject: [PATCH] Remove dependency on pear/text_diff, we use
 pear-pear.horde.org/horde_text_diff everywhere now

---
 composer.json |  1 -
 composer.lock | 42 +++---------------------------------------
 2 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/composer.json b/composer.json
index 38c94618a4..66efcd01d6 100644
--- a/composer.json
+++ b/composer.json
@@ -70,7 +70,6 @@
 		"pear/auth_sasl": "*",
 		"pear/xml_feed_parser": "^1.0.5",
 		"pear/log": "*",
-		"pear/text_diff": "^1.2.2",
 		"bower-asset/jquery": "^1.12.4",
 		"bower-asset/fastclick":"1.0.*",
 		"bower-asset/jquery-touchswipe": "1.6.*",
diff --git a/composer.lock b/composer.lock
index 6b5ff3d6cf..a7c868dfd4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "ae8efa0b4a05424ce6c63e679ff7f703",
+    "content-hash": "2b00ad598700859fd0600f10fd8967bb",
     "packages": [
         {
             "name": "adldap2/adldap2",
@@ -787,15 +787,12 @@
                 "php": ">=5.4.0"
             },
             "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "AGPL-3.0"
             ],
             "description": "Z-Push is an open-source application to synchronize ActiveSync compatible devices",
             "homepage": "http://z-push.org/",
-            "support": {
-                "source": "https://github.com/EGroupware/z-push/tree/master",
-                "issues": "https://github.com/EGroupware/z-push/issues"
-            },
             "time": "2019-02-11T19:26:21+00:00"
         },
         {
@@ -2256,39 +2253,6 @@
             "description": "More info available on: http://pear.php.net/package/Structures_Graph",
             "time": "2015-07-20T20:05:12+00:00"
         },
-        {
-            "name": "pear/text_diff",
-            "version": "v1.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pear/Text_Diff.git",
-                "reference": "d12474df481bb89f52b02ba0e3fae504ce5d6d51"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pear/Text_Diff/zipball/d12474df481bb89f52b02ba0e3fae504ce5d6d51",
-                "reference": "d12474df481bb89f52b02ba0e3fae504ce5d6d51",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "Text/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-3.0"
-            ],
-            "description": "Engine for performing and rendering text diffs",
-            "homepage": "http://pear.php.net/package/Text_Diff",
-            "keywords": [
-                "PEAR",
-                "diff",
-                "text"
-            ],
-            "time": "2017-03-08T15:07:59+00:00"
-        },
         {
             "name": "pear/xml_feed_parser",
             "version": "v1.0.5",