From c6fd6b03742c0459604925fd0daae5f15b67dcb1 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Thu, 26 Oct 2017 12:52:53 +0000
Subject: [PATCH] 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

Built from https://develop.svn.wordpress.org/trunk@42028


git-svn-id: http://core.svn.wordpress.org/trunk@41862 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/Text/Diff/Engine/native.php | 6 ++++--
 wp-includes/version.php                 | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/wp-includes/Text/Diff/Engine/native.php b/wp-includes/Text/Diff/Engine/native.php
index ff2b8b5b45..5824329b7f 100644
--- a/wp-includes/Text/Diff/Engine/native.php
+++ b/wp-includes/Text/Diff/Engine/native.php
@@ -190,15 +190,16 @@ class Text_Diff_Engine_native {
                 }
                 $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 @@ class Text_Diff_Engine_native {
                         assert($k > 0);
                         $ymids[$k] = $ymids[$k - 1];
                     }
+                    next($matches);
                 }
             }
         }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a0b144a341..53624ea948 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-beta4-42027';
+$wp_version = '4.9-beta4-42028';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.