From 1aa45a026b061b0eaa7ad49385c0e70850ccf6c4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Wed, 3 Aug 2022 12:55:27 +0200
Subject: [PATCH] Migrate to sebastian/diff

---
 .../install/files/acp/templates/templateDiff.tpl     |  8 ++++----
 .../files/lib/acp/page/TemplateDiffPage.class.php    |  6 ++++--
 .../lib/acp/page/VersionTrackerListPage.class.php    | 12 +++++++-----
 .../install/files/lib/page/EditHistoryPage.class.php | 12 +++++++-----
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/templateDiff.tpl b/wcfsetup/install/files/acp/templates/templateDiff.tpl
index 441d636d1c..b83cb235a8 100644
--- a/wcfsetup/install/files/acp/templates/templateDiff.tpl
+++ b/wcfsetup/install/files/acp/templates/templateDiff.tpl
@@ -10,7 +10,7 @@
 		<nav class="contentHeaderNavigation">
 			<ul>
 				{content}
-					{if $diff}
+					{if $diff !== null}
 						{if $parent->templateGroupID}
 							<li><a href="{link controller='TemplateEdit' id=$parent->templateID}{/link}" class="button"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.global.button.edit{/lang}</span></a></li>
 						{/if}
@@ -50,7 +50,7 @@
 	</div>
 </form>
 
-{if $diff}
+{if $diff !== null}
 	<div id="fullscreenContainer">
 		<div class="sideBySide">
 			<div class="section">
@@ -66,7 +66,7 @@
 				<pre id="left" class="monospace" style="overflow: auto; height: 700px;">{*
 					*}<span style="display: inline-block;">{* <-- wrapper span to prevent content from overflowing the <li>
 						*}<ol class="nativeList">{*
-							*}{foreach from=$diff->getRawDiff() item='line'}{*
+							*}{foreach from=$diff item='line'}{*
 								*}{if $line[0] == ' '}{*
 									*}{assign var=removeOffset value=0}{assign var=lineNo value=$lineNo + 1}{*
 									*}<li value="{@$lineNo}" style="margin: 0">{$line[1]}</li>{*
@@ -94,7 +94,7 @@
 				<pre id="right" class="monospace" style="overflow: auto; height: 700px;">{*
 					*}<span style="display: inline-block;">{* <-- wrapper span to prevent content from overflowing the <li>
 						*}<ol class="nativeList">{*
-							*}{foreach from=$diff->getRawDiff() item='line'}{*
+							*}{foreach from=$diff item='line'}{*
 								*}{if $line[0] == ' '}{*
 									*}{if $removeOffset > 0}{*
 										*}{@'<li style="list-style-type: none;margin: 0">&nbsp;</li>'|str_repeat:$removeOffset}{*
diff --git a/wcfsetup/install/files/lib/acp/page/TemplateDiffPage.class.php b/wcfsetup/install/files/lib/acp/page/TemplateDiffPage.class.php
index e6d57b295e..b2dbc32ef0 100644
--- a/wcfsetup/install/files/lib/acp/page/TemplateDiffPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/TemplateDiffPage.class.php
@@ -2,6 +2,7 @@
 
 namespace wcf\acp\page;
 
+use SebastianBergmann\Diff\Differ;
 use wcf\data\template\group\TemplateGroupList;
 use wcf\data\template\Template;
 use wcf\data\template\TemplateList;
@@ -52,7 +53,7 @@ class TemplateDiffPage extends AbstractPage
 
     /**
      * differences between both templates
-     * @var Diff
+     * @var array
      */
     public $diff;
 
@@ -127,7 +128,8 @@ class TemplateDiffPage extends AbstractPage
         if ($this->parent->templateID) {
             $a = \explode("\n", StringUtil::unifyNewlines($this->parent->getSource()));
             $b = \explode("\n", StringUtil::unifyNewlines($this->template->getSource()));
-            $this->diff = new Diff($a, $b);
+            $differ = new Differ();
+            $this->diff = Diff::rawDiffFromSebastianDiff($differ->diffToArray($a, $b));
         }
     }
 
diff --git a/wcfsetup/install/files/lib/acp/page/VersionTrackerListPage.class.php b/wcfsetup/install/files/lib/acp/page/VersionTrackerListPage.class.php
index 11c7d85aa1..cbe975afc5 100644
--- a/wcfsetup/install/files/lib/acp/page/VersionTrackerListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/VersionTrackerListPage.class.php
@@ -2,6 +2,7 @@
 
 namespace wcf\acp\page;
 
+use SebastianBergmann\Diff\Differ;
 use wcf\data\IVersionTrackerObject;
 use wcf\data\language\Language;
 use wcf\page\AbstractPage;
@@ -75,7 +76,7 @@ class VersionTrackerListPage extends AbstractPage
 
     /**
      * differences between both versions
-     * @var Diff[]
+     * @var array
      */
     public $diffs = [];
 
@@ -171,6 +172,8 @@ class VersionTrackerListPage extends AbstractPage
     {
         parent::readData();
 
+        $differ = new Differ();
+
         // valid IDs were given, calculate diff
         if ($this->old && $this->new) {
             $languageIDs = $this->new->getLanguageIDs();
@@ -199,8 +202,7 @@ class VersionTrackerListPage extends AbstractPage
                         continue;
                     }
 
-                    $diff = new Diff($a, $b);
-                    $rawDiff = $diff->getRawDiff();
+                    $rawDiff = Diff::rawDiffFromSebastianDiff($differ->diffToArray($a, $b));
 
                     // create word diff for small changes (only one consecutive paragraph modified)
                     for ($i = 0, $max = \count($rawDiff); $i < $max;) {
@@ -213,10 +215,10 @@ class VersionTrackerListPage extends AbstractPage
                             $a = \preg_split('/(\\W)/u', $rawDiff[$i][1], -1, \PREG_SPLIT_DELIM_CAPTURE);
                             $b = \preg_split('/(\\W)/u', $rawDiff[$i + 1][1], -1, \PREG_SPLIT_DELIM_CAPTURE);
 
-                            $diff = new Diff($a, $b);
+                            $diff = Diff::rawDiffFromSebastianDiff($differ->diffToArray($a, $b));
                             $rawDiff[$i][1] = '';
                             $rawDiff[$i + 1][1] = '';
-                            foreach ($diff->getRawDiff() as $entry) {
+                            foreach ($diff as $entry) {
                                 $entry[1] = StringUtil::encodeHTML($entry[1]);
 
                                 if ($entry[0] === Diff::SAME) {
diff --git a/wcfsetup/install/files/lib/page/EditHistoryPage.class.php b/wcfsetup/install/files/lib/page/EditHistoryPage.class.php
index bd8eca33d6..89034db7b0 100644
--- a/wcfsetup/install/files/lib/page/EditHistoryPage.class.php
+++ b/wcfsetup/install/files/lib/page/EditHistoryPage.class.php
@@ -2,6 +2,7 @@
 
 namespace wcf\page;
 
+use SebastianBergmann\Diff\Differ;
 use wcf\data\DatabaseObjectList;
 use wcf\data\edit\history\entry\EditHistoryEntry;
 use wcf\data\edit\history\entry\EditHistoryEntryList;
@@ -63,7 +64,7 @@ class EditHistoryPage extends AbstractPage
 
     /**
      * differences between both versions
-     * @var Diff
+     * @var array
      */
     public $diff;
 
@@ -176,12 +177,13 @@ class EditHistoryPage extends AbstractPage
         $this->objectList->getConditionBuilder()->add('objectID = ?', [$this->objectID]);
         $this->objectList->readObjects();
 
+        $differ = new Differ();
+
         // valid IDs were given, calculate diff
         if ($this->old && $this->new) {
             $a = \explode("\n", StringUtil::unifyNewlines(StringUtil::trim($this->old->getMessage())));
             $b = \explode("\n", StringUtil::unifyNewlines(StringUtil::trim($this->new->getMessage())));
-            $diff = new Diff($a, $b);
-            $this->diff = $diff->getRawDiff();
+            $this->diff = Diff::rawDiffFromSebastianDiff($differ->diffToArray($a, $b));
 
             // create word diff for small changes (only one consecutive paragraph modified)
             for ($i = 0, $max = \count($this->diff); $i < $max;) {
@@ -194,10 +196,10 @@ class EditHistoryPage extends AbstractPage
                     $a = \preg_split('/(\\W)/u', $this->diff[$i][1], -1, \PREG_SPLIT_DELIM_CAPTURE);
                     $b = \preg_split('/(\\W)/u', $this->diff[$i + 1][1], -1, \PREG_SPLIT_DELIM_CAPTURE);
 
-                    $diff = new Diff($a, $b);
+                    $diff = Diff::rawDiffFromSebastianDiff($differ->diffToArray($a, $b));
                     $this->diff[$i][1] = '';
                     $this->diff[$i + 1][1] = '';
-                    foreach ($diff->getRawDiff() as $entry) {
+                    foreach ($diff as $entry) {
                         $entry[1] = StringUtil::encodeHTML($entry[1]);
 
                         if ($entry[0] === Diff::SAME) {
-- 
2.20.1