Merge pull request #272 from creative-commoners/pulls/2/htmldiff-name…

…-change Failed JS test steps are unrelated to these changes
silverstripe · Feb 8, 2023 · 90bc363 · 90bc363
2 parents cb31759 + 90ee112
commit 90bc363
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Forms/DiffField.php b/src/Forms/DiffField.php
@@ -6,7 +6,7 @@
 use SilverStripe\Forms\HTMLEditor\HTMLEditorField_Readonly;
 use SilverStripe\Forms\HTMLReadonlyField;
 use SilverStripe\Forms\ReadonlyField;
-use SilverStripe\View\Parsers\Diff;
+use SilverStripe\View\Parsers\HtmlDiff;
 
 /**
  * This form field is both a field object in it's own right, and a decorator for another field type.
@@ -71,7 +71,8 @@ public function Value()
                 $newValue = strip_tags($emptyPlaceholder);
             }
         }
-        return Diff::compareHTML($oldValue, $newValue, $escape);
+
+        return HtmlDiff::compareHtml($oldValue ?? '', $newValue ?? '', $escape);
     }
 
     /**

diff --git a/tests/Forms/DiffFieldTest.php b/tests/Forms/DiffFieldTest.php
@@ -21,7 +21,7 @@ public function testScalarValuesAreDiffed()
         $diffField->setComparisonField($newField);
         $diffField->setValue('old');
 
-        $this->assertMatchesRegularExpression('/^<ins>new<\/ins> *<del>old<\/del>$/', $diffField->Value());
+        $this->assertMatchesRegularExpression('/^<del>old<\/del> *<ins>new<\/ins>$/', $diffField->Value());
     }
 
     /**
@@ -90,14 +90,14 @@ public function provideEscaping()
                 ReadonlyField::class,
                 '',
                 'Something',
-                '<ins>$emptyPlaceholderNoTags</ins> <del>Something</del>',
+                '<del>Something</del> <ins>$emptyPlaceholderNoTags</ins>',
                 'No value is escaped without tags removed when value added'
             ],
             [
                 ReadonlyField::class,
                 'Something',
                 '',
-                '<ins>Something</ins> <del>$emptyPlaceholderNoTags</del>',
+                '<del>$emptyPlaceholderNoTags</del> <ins>Something</ins>',
                 'No value is escaped without tags removed when value removed'
             ],
         ];