Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / vendor / caxy / php-htmldiff / lib / Caxy / HtmlDiff / Preprocessor.php

diff --git a/vendor/caxy/php-htmldiff/lib/Caxy/HtmlDiff/Preprocessor.php b/vendor/caxy/php-htmldiff/lib/Caxy/HtmlDiff/Preprocessor.php
index 1d8abb3725080da75e86721f8be3b6148c048cb1..9acc8691a3a577ec84719cc485dfa4bdc4857aa9 100644 (file)
--- a/vendor/caxy/php-htmldiff/lib/Caxy/HtmlDiff/Preprocessor.php
+++ b/vendor/caxy/php-htmldiff/lib/Caxy/HtmlDiff/Preprocessor.php
@@ -7,19 +7,19 @@ class Preprocessor
     public static function diffCommonPrefix($old, $new)
     {
         // Quick check for common null cases.
-        if (strlen($old) == 0 || strlen($new) == 0 || substr($old, 0, 1) != substr($new, 0, 1)) {
+        if (mb_strlen($old) == 0 || mb_strlen($new) == 0 || mb_substr($old, 0, 1) != mb_substr($new, 0, 1)) {
             return 0;
         }
 
         // Binary Search
         $pointerMin = 0;
-        $pointerMax = min(strlen($old), strlen($new));
+        $pointerMax = min(mb_strlen($old), mb_strlen($new));
         $pointerMid = $pointerMax;
         $pointerStart = 0;
         while ($pointerMin < $pointerMid) {
             $cmp = substr_compare(
                 $old,
-                substr($new, $pointerStart, $pointerMid - $pointerStart),
+                mb_substr($new, $pointerStart, $pointerMid - $pointerStart),
                 $pointerStart,
                 $pointerMid - $pointerStart
             );
@@ -37,19 +37,19 @@ class Preprocessor
     public static function diffCommonSuffix($old, $new)
     {
         // Quick check for common null cases.
-        if (strlen($old) == 0 || strlen($new) == 0 || substr($old, strlen($old) - 1, 1) != substr($new, strlen($new) - 1, 1)) {
+        if (mb_strlen($old) == 0 || mb_strlen($new) == 0 || mb_substr($old, mb_strlen($old) - 1, 1) != mb_substr($new, mb_strlen($new) - 1, 1)) {
             return 0;
         }
 
         // Binary Search
         $pointerMin = 0;
-        $pointerMax = min(strlen($old), strlen($new));
+        $pointerMax = min(mb_strlen($old), mb_strlen($new));
         $pointerMid = $pointerMax;
         $pointerEnd = 0;
-        $oldLen = strlen($old);
-        $newLen = strlen($new);
+        $oldLen = mb_strlen($old);
+        $newLen = mb_strlen($new);
         while ($pointerMin < $pointerMid) {
-            if (substr($old, $oldLen - $pointerMid, $pointerMid - $pointerEnd) == substr($new, $newLen - $pointerMid, $pointerMid - $pointerEnd)) {
+            if (mb_substr($old, $oldLen - $pointerMid, $pointerMid - $pointerEnd) == mb_substr($new, $newLen - $pointerMid, $pointerMid - $pointerEnd)) {
                 $pointerMin = $pointerMid;
                 $pointerEnd = $pointerMin;
             } else {