Changeset 42028 for trunk/src/wp-includes/Text/Diff/Engine/native.php

Timestamp:

10/26/2017 12:51:51 PM (7 years ago)

Author:

johnbillion

Message:

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

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

File:

• trunk/src/wp-includes/Text/Diff/Engine/native.php (modified) (3 diffs)

trunk/src/wp-includes/Text/Diff/Engine/native.php

@@ -191 +191 @@
                 $matches = $ymatches[$line];
                 reset($matches);
-                while (list(, $y) = each($matches)) {
+                while ($y = current($matches)) {
                     if (empty($this->in_seq[$y])) {
                         $k = $this->_lcsPos($y);
@@ -198 +198 @@
                         break;
                     }
-                }
-                while (list(, $y) = each($matches)) {
+                    next($matches);
+                }
+                while ($y = current($matches)) {
                     if ($y > $this->seq[$k - 1]) {
                         assert($y <= $this->seq[$k]);
@@ -212 +213 @@
                         $ymids[$k] = $ymids[$k - 1];
                     }
+                    next($matches);
                 }
             }