From c8e89896f7268e7464e96c412e24a04196f9a39f Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Sat, 29 Oct 2011 02:04:27 +0000
Subject: [PATCH] Remove more assignments in conditionals (while each to
 foreach)

---
 includes/MagicWord.php        | 2 +-
 includes/diff/DairikiDiff.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index e3279718a4..136aac93ad 100644
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -754,7 +754,7 @@ class MagicWordArray {
 	 */
 	function parseMatch( $m ) {
 		reset( $m );
-		while ( list( $key, $value ) = each( $m ) ) {
+		foreach ( $m as $key => $value ) {
 			if ( $key === 0 || $value === '' ) {
 				continue;
 			}
diff --git a/includes/diff/DairikiDiff.php b/includes/diff/DairikiDiff.php
index c935eee284..7f618fc8a8 100644
--- a/includes/diff/DairikiDiff.php
+++ b/includes/diff/DairikiDiff.php
@@ -371,7 +371,7 @@ class _DiffEngine {
 				}
 				$matches = $ymatches[$line];
 				reset( $matches );
-				while ( list( , $y ) = each( $matches ) ) {
+				foreach ( $matches as $y ) {
 					if ( empty( $this->in_seq[$y] ) ) {
 						$k = $this->_lcs_pos( $y );
 						assert( $k > 0 );
@@ -379,7 +379,7 @@ class _DiffEngine {
 						break;
 					}
 				}
-				while ( list ( , $y ) = each( $matches ) ) {
+				foreach ( $matches as $y ) {
 					if ( $y > $this->seq[$k -1] ) {
 						assert( $y < $this->seq[$k] );
 						// Optimization: this is a common case:
@@ -493,7 +493,7 @@ class _DiffEngine {
 			// Use the partitions to split this problem into subproblems.
 			reset( $seps );
 			$pt1 = $seps[0];
-			while ( $pt2 = next( $seps ) ) {
+			foreach ( $seps as $pt2 ) {
 				$this->_compareseq ( $pt1[0], $pt2[0], $pt1[1], $pt2[1] );
 				$pt1 = $pt2;
 			}
-- 
2.20.1