sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

External Libraries: Remove usage of each() from the Text_Diff_Engine_native class.

Browse Source 
This removes deprecated notices in PHP 7.2 but takes a different approach to the upstream class from Horde, which appears to be buggy.

Props SergeyBiryukov
Fixes #41526


git-svn-id: https://develop.svn.wordpress.org/trunk@42028 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
John Blackbourn 2017-10-26 12:51:51 +00:00
parent 54602b9904
commit afa1b06984
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wp-includes/Text/Diff/Engine/native.php
View File

@ -190,15 +190,16 @@ class Text_Diff_Engine_native {
} }
$matches = $ymatches[$line]; $matches = $ymatches[$line];
reset($matches); reset($matches);
while (list(, $y) = each($matches)) { while ($y = current($matches)) {
if (empty($this->in_seq[$y])) { if (empty($this->in_seq[$y])) {
$k = $this->_lcsPos($y); $k = $this->_lcsPos($y);
assert($k > 0); assert($k > 0);
$ymids[$k] = $ymids[$k - 1]; $ymids[$k] = $ymids[$k - 1];
break; break;
} }
next($matches);
} }
while (list(, $y) = each($matches)) { while ($y = current($matches)) {
if ($y > $this->seq[$k - 1]) { if ($y > $this->seq[$k - 1]) {
assert($y <= $this->seq[$k]); assert($y <= $this->seq[$k]);
/* Optimization: this is a common case: next match is /* Optimization: this is a common case: next match is
@ -211,6 +212,7 @@ class Text_Diff_Engine_native {
assert($k > 0); assert($k > 0);
$ymids[$k] = $ymids[$k - 1]; $ymids[$k] = $ymids[$k - 1];
} }
next($matches);
} }
} }
} }