diff -r 490d5cc509ed -r cf61fcea0001 wp/wp-includes/Text/Diff/Engine/native.php --- a/wp/wp-includes/Text/Diff/Engine/native.php Tue Jun 09 11:14:17 2015 +0000 +++ b/wp/wp-includes/Text/Diff/Engine/native.php Mon Oct 14 17:39:30 2019 +0200 @@ -190,15 +190,16 @@ } $matches = $ymatches[$line]; reset($matches); - while (list(, $y) = each($matches)) { + while ($y = current($matches)) { if (empty($this->in_seq[$y])) { $k = $this->_lcsPos($y); assert($k > 0); $ymids[$k] = $ymids[$k - 1]; break; } + next($matches); } - while (list(, $y) = each($matches)) { + while ($y = current($matches)) { if ($y > $this->seq[$k - 1]) { assert($y <= $this->seq[$k]); /* Optimization: this is a common case: next match is @@ -211,6 +212,7 @@ assert($k > 0); $ymids[$k] = $ymids[$k - 1]; } + next($matches); } } } @@ -330,7 +332,7 @@ $i = 0; $j = 0; - assert('count($lines) == count($changed)'); + assert(count($lines) == count($changed)); $len = count($lines); $other_len = count($other_changed); @@ -351,7 +353,7 @@ } while ($i < $len && ! $changed[$i]) { - assert('$j < $other_len && ! $other_changed[$j]'); + assert($j < $other_len && ! $other_changed[$j]); $i++; $j++; while ($j < $other_len && $other_changed[$j]) { $j++; @@ -383,11 +385,11 @@ while ($start > 0 && $changed[$start - 1]) { $start--; } - assert('$j > 0'); + assert($j > 0); while ($other_changed[--$j]) { continue; } - assert('$j >= 0 && !$other_changed[$j]'); + assert($j >= 0 && !$other_changed[$j]); } /* Set CORRESPONDING to the end of the changed run, at the @@ -408,7 +410,7 @@ $i++; } - assert('$j < $other_len && ! $other_changed[$j]'); + assert($j < $other_len && ! $other_changed[$j]); $j++; if ($j < $other_len && $other_changed[$j]) { $corresponding = $i; @@ -424,11 +426,11 @@ while ($corresponding < $i) { $changed[--$start] = 1; $changed[--$i] = 0; - assert('$j > 0'); + assert($j > 0); while ($other_changed[--$j]) { continue; } - assert('$j >= 0 && !$other_changed[$j]'); + assert($j >= 0 && !$other_changed[$j]); } } }