From: daniel <daniel.kinzler@wikimedia.de>
Date: Thu, 26 Jul 2012 18:08:54 +0000 (+0200)
Subject: fix logic bug in assertArrayEquals
X-Git-Tag: 1.31.0-rc.0~22942^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=3db0b6684de69dbba2cc7d8df3159946820a78b4;p=lhc%2Fweb%2Fwiklou.git

fix logic bug in assertArrayEquals

Change-Id: I442ebfe77292918f29121aba1205de664723e468
---

diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php
index 8f18d6edc3..c96eba02f6 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -400,16 +400,16 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 	 * @param boolean $named If the keys should match
 	 */
 	protected function assertArrayEquals( array $expected, array $actual, $ordered = false, $named = false ) {
-		if ( !$named ) {
-			$expected = array_values( $expected );
-			$actual = array_values( $actual );
-		}
-
 		if ( !$ordered ) {
 			asort( $expected );
 			asort( $actual );
 		}
 
+		if ( !$named ) {
+			$expected = array_values( $expected );
+			$actual = array_values( $actual );
+		}
+
 		call_user_func_array(
 			array( $this, 'assertEquals' ),
 			array_merge( array( $expected, $actual ), array_slice( func_get_args(), 4 ) )