X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Flibs%2FArrayUtilsTest.php;h=76b4ee17be80c05988badc72af45b7f68ac12c05;hb=75160bdd3b4ac3642d147cda46e47c809999937d;hp=32b150c7e6ea44903dbded872f8879b72cc595d0;hpb=04fdc78370dbc042116488d6826e19bf3910273b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/libs/ArrayUtilsTest.php b/tests/phpunit/includes/libs/ArrayUtilsTest.php
index 32b150c7e6..76b4ee17be 100644
--- a/tests/phpunit/includes/libs/ArrayUtilsTest.php
+++ b/tests/phpunit/includes/libs/ArrayUtilsTest.php
@@ -6,6 +6,9 @@
  */
 
 class ArrayUtilsTest extends PHPUnit_Framework_TestCase {
+
+	use MediaWikiCoversValidator;
+
 	private $search;
 
 	/**
@@ -23,11 +26,10 @@ class ArrayUtilsTest extends PHPUnit_Framework_TestCase {
 	}
 
 	function provideFindLowerBound() {
-		$that = $this;
-		$indexValueCallback = function ( $size ) use ( $that ) {
-			return function ( $val ) use ( $that, $size ) {
-				$that->assertTrue( $val >= 0 );
-				$that->assertTrue( $val < $size );
+		$indexValueCallback = function ( $size ) {
+			return function ( $val ) use ( $size ) {
+				$this->assertTrue( $val >= 0 );
+				$this->assertTrue( $val < $size );
 				return $val;
 			};
 		};
@@ -35,99 +37,99 @@ class ArrayUtilsTest extends PHPUnit_Framework_TestCase {
 			return $a - $b;
 		};
 
-		return array(
-			array(
+		return [
+			[
 				$indexValueCallback( 0 ),
 				0,
 				$comparisonCallback,
 				1,
 				false,
-			),
-			array(
+			],
+			[
 				$indexValueCallback( 1 ),
 				1,
 				$comparisonCallback,
 				-1,
 				false,
-			),
-			array(
+			],
+			[
 				$indexValueCallback( 1 ),
 				1,
 				$comparisonCallback,
 				0,
 				0,
-			),
-			array(
+			],
+			[
 				$indexValueCallback( 1 ),
 				1,
 				$comparisonCallback,
 				1,
 				0,
-			),
-			array(
+			],
+			[
 				$indexValueCallback( 2 ),
 				2,
 				$comparisonCallback,
 				-1,
 				false,
-			),
-			array(
+			],
+			[
 				$indexValueCallback( 2 ),
 				2,
 				$comparisonCallback,
 				0,
 				0,
-			),
-			array(
+			],
+			[
 				$indexValueCallback( 2 ),
 				2,
 				$comparisonCallback,
 				0.5,
 				0,
-			),
-			array(
+			],
+			[
 				$indexValueCallback( 2 ),
 				2,
 				$comparisonCallback,
 				1,
 				1,
-			),
-			array(
+			],
+			[
 				$indexValueCallback( 2 ),
 				2,
 				$comparisonCallback,
 				1.5,
 				1,
-			),
-			array(
+			],
+			[
 				$indexValueCallback( 3 ),
 				3,
 				$comparisonCallback,
 				1,
 				1,
-			),
-			array(
+			],
+			[
 				$indexValueCallback( 3 ),
 				3,
 				$comparisonCallback,
 				1.5,
 				1,
-			),
-			array(
+			],
+			[
 				$indexValueCallback( 3 ),
 				3,
 				$comparisonCallback,
 				2,
 				2,
-			),
-			array(
+			],
+			[
 				$indexValueCallback( 3 ),
 				3,
 				$comparisonCallback,
 				3,
 				2,
-			),
-		);
+			],
+		];
 	}
 
 	/**
@@ -143,169 +145,169 @@ class ArrayUtilsTest extends PHPUnit_Framework_TestCase {
 	}
 
 	function provideArrayDiffAssocRecursive() {
-		return array(
-			array(
-				array(),
-				array(),
-				array(),
-			),
-			array(
-				array(),
-				array(),
-				array(),
-				array(),
-			),
-			array(
-				array( 1 ),
-				array( 1 ),
-				array(),
-			),
-			array(
-				array( 1 ),
-				array( 1 ),
-				array(),
-				array(),
-			),
-			array(
-				array(),
-				array(),
-				array( 1 ),
-			),
-			array(
-				array(),
-				array(),
-				array( 1 ),
-				array( 2 ),
-			),
-			array(
-				array( '' => 1 ),
-				array( '' => 1 ),
-				array(),
-			),
-			array(
-				array(),
-				array(),
-				array( '' => 1 ),
-			),
-			array(
-				array( 1 ),
-				array( 1 ),
-				array( 2 ),
-			),
-			array(
-				array(),
-				array( 1 ),
-				array( 2 ),
-				array( 1 ),
-			),
-			array(
-				array(),
-				array( 1 ),
-				array( 1, 2 ),
-			),
-			array(
-				array( 1 => 1 ),
-				array( 1 => 1 ),
-				array( 1 ),
-			),
-			array(
-				array(),
-				array( 1 => 1 ),
-				array( 1 ),
-				array( 1 => 1 ),
-			),
-			array(
-				array(),
-				array( 1 => 1 ),
-				array( 1, 1, 1 ),
-			),
-			array(
-				array(),
-				array( array() ),
-				array(),
-			),
-			array(
-				array(),
-				array( array( array() ) ),
-				array(),
-			),
-			array(
-				array( 1, array( 1 ) ),
-				array( 1, array( 1 ) ),
-				array(),
-			),
-			array(
-				array( 1 ),
-				array( 1, array( 1 ) ),
-				array( 2, array( 1 ) ),
-			),
-			array(
-				array(),
-				array( 1, array( 1 ) ),
-				array( 2, array( 1 ) ),
-				array( 1, array( 2 ) ),
-			),
-			array(
-				array( 1 ),
-				array( 1, array() ),
-				array( 2 ),
-			),
-			array(
-				array(),
-				array( 1, array() ),
-				array( 2 ),
-				array( 1 ),
-			),
-			array(
-				array( 1, array( 1 => 2 ) ),
-				array( 1, array( 1, 2 ) ),
-				array( 2, array( 1 ) ),
-			),
-			array(
-				array( 1 ),
-				array( 1, array( 1, 2 ) ),
-				array( 2, array( 1 ) ),
-				array( 2, array( 1 => 2 ) ),
-			),
-			array(
-				array( 1 => array( 1, 2 ) ),
-				array( 1, array( 1, 2 ) ),
-				array( 1, array( 2 ) ),
-			),
-			array(
-				array( 1 => array( array( 2, 3 ), 2 ) ),
-				array( 1, array( array( 2, 3 ), 2 ) ),
-				array( 1, array( 2 ) ),
-			),
-			array(
-				array( 1 => array( array( 2 ), 2 ) ),
-				array( 1, array( array( 2, 3 ), 2 ) ),
-				array( 1, array( array( 1 => 3 ) ) ),
-			),
-			array(
-				array( 1 => array( 1 => 2 ) ),
-				array( 1, array( array( 2, 3 ), 2 ) ),
-				array( 1, array( array( 1 => 3, 0 => 2 ) ) ),
-			),
-			array(
-				array( 1 => array( 1 => 2 ) ),
-				array( 1, array( array( 2, 3 ), 2 ) ),
-				array( 1, array( array( 1 => 3 ) ) ),
-				array( 1 => array( array( 2 ) ) ),
-			),
-			array(
-				array(),
-				array( 1, array( array( 2, 3 ), 2 ) ),
-				array( 1 => array( 1 => 2, 0 => array( 1 => 3, 0 => 2 ) ), 0 => 1 ),
-			),
-			array(
-				array(),
-				array( 1, array( array( 2, 3 ), 2 ) ),
-				array( 1 => array( 1 => 2 ) ),
-				array( 1 => array( array( 1 => 3 ) ) ),
-				array( 1 => array( array( 2 ) ) ),
-				array( 1 ),
-			),
-		);
+		return [
+			[
+				[],
+				[],
+				[],
+			],
+			[
+				[],
+				[],
+				[],
+				[],
+			],
+			[
+				[ 1 ],
+				[ 1 ],
+				[],
+			],
+			[
+				[ 1 ],
+				[ 1 ],
+				[],
+				[],
+			],
+			[
+				[],
+				[],
+				[ 1 ],
+			],
+			[
+				[],
+				[],
+				[ 1 ],
+				[ 2 ],
+			],
+			[
+				[ '' => 1 ],
+				[ '' => 1 ],
+				[],
+			],
+			[
+				[],
+				[],
+				[ '' => 1 ],
+			],
+			[
+				[ 1 ],
+				[ 1 ],
+				[ 2 ],
+			],
+			[
+				[],
+				[ 1 ],
+				[ 2 ],
+				[ 1 ],
+			],
+			[
+				[],
+				[ 1 ],
+				[ 1, 2 ],
+			],
+			[
+				[ 1 => 1 ],
+				[ 1 => 1 ],
+				[ 1 ],
+			],
+			[
+				[],
+				[ 1 => 1 ],
+				[ 1 ],
+				[ 1 => 1 ],
+			],
+			[
+				[],
+				[ 1 => 1 ],
+				[ 1, 1, 1 ],
+			],
+			[
+				[],
+				[ [] ],
+				[],
+			],
+			[
+				[],
+				[ [ [] ] ],
+				[],
+			],
+			[
+				[ 1, [ 1 ] ],
+				[ 1, [ 1 ] ],
+				[],
+			],
+			[
+				[ 1 ],
+				[ 1, [ 1 ] ],
+				[ 2, [ 1 ] ],
+			],
+			[
+				[],
+				[ 1, [ 1 ] ],
+				[ 2, [ 1 ] ],
+				[ 1, [ 2 ] ],
+			],
+			[
+				[ 1 ],
+				[ 1, [] ],
+				[ 2 ],
+			],
+			[
+				[],
+				[ 1, [] ],
+				[ 2 ],
+				[ 1 ],
+			],
+			[
+				[ 1, [ 1 => 2 ] ],
+				[ 1, [ 1, 2 ] ],
+				[ 2, [ 1 ] ],
+			],
+			[
+				[ 1 ],
+				[ 1, [ 1, 2 ] ],
+				[ 2, [ 1 ] ],
+				[ 2, [ 1 => 2 ] ],
+			],
+			[
+				[ 1 => [ 1, 2 ] ],
+				[ 1, [ 1, 2 ] ],
+				[ 1, [ 2 ] ],
+			],
+			[
+				[ 1 => [ [ 2, 3 ], 2 ] ],
+				[ 1, [ [ 2, 3 ], 2 ] ],
+				[ 1, [ 2 ] ],
+			],
+			[
+				[ 1 => [ [ 2 ], 2 ] ],
+				[ 1, [ [ 2, 3 ], 2 ] ],
+				[ 1, [ [ 1 => 3 ] ] ],
+			],
+			[
+				[ 1 => [ 1 => 2 ] ],
+				[ 1, [ [ 2, 3 ], 2 ] ],
+				[ 1, [ [ 1 => 3, 0 => 2 ] ] ],
+			],
+			[
+				[ 1 => [ 1 => 2 ] ],
+				[ 1, [ [ 2, 3 ], 2 ] ],
+				[ 1, [ [ 1 => 3 ] ] ],
+				[ 1 => [ [ 2 ] ] ],
+			],
+			[
+				[],
+				[ 1, [ [ 2, 3 ], 2 ] ],
+				[ 1 => [ 1 => 2, 0 => [ 1 => 3, 0 => 2 ] ], 0 => 1 ],
+			],
+			[
+				[],
+				[ 1, [ [ 2, 3 ], 2 ] ],
+				[ 1 => [ 1 => 2 ] ],
+				[ 1 => [ [ 1 => 3 ] ] ],
+				[ 1 => [ [ 2 ] ] ],
+				[ 1 ],
+			],
+		];
 	}
 }