Update to MediaWiki 1.26.0

1 files changed, 0 insertions, 33 deletions

diff --git a/tests/phpunit/includes/media/FormatMetadataTest.php b/tests/phpunit/includes/media/FormatMetadataTest.php
index 54758f94..b666c83c 100644
--- a/tests/phpunit/includes/media/FormatMetadataTest.php
+++ b/tests/phpunit/includes/media/FormatMetadataTest.php
@@ -37,39 +37,6 @@ class FormatMetadataTest extends MediaWikiMediaTestCase {
 	}
 
 	/**
-	 * @param string $filename
-	 * @param int $expected Total image area
-	 * @dataProvider provideFlattenArray
-	 * @covers FormatMetadata::flattenArray
-	 */
-	public function testFlattenArray( $vals, $type, $noHtml, $ctx, $expected ) {
-		$actual = FormatMetadata::flattenArray( $vals, $type, $noHtml, $ctx );
-		$this->assertEquals( $expected, $actual );
-	}
-
-	public static function provideFlattenArray() {
-		return array(
-			array(
-				array( 1, 2, 3 ), 'ul', false, false,
-				"<ul><li>1</li>\n<li>2</li>\n<li>3</li></ul>",
-			),
-			array(
-				array( 1, 2, 3 ), 'ol', false, false,
-				"<ol><li>1</li>\n<li>2</li>\n<li>3</li></ol>",
-			),
-			array(
-				array( 1, 2, 3 ), 'ul', true, false,
-				"\n*1\n*2\n*3",
-			),
-			array(
-				array( 1, 2, 3 ), 'ol', true, false,
-				"\n#1\n#2\n#3",
-			),
-			// TODO: more test cases
-		);
-	}
-
-	/**
 	 * @param mixed $input
 	 * @param mixed $output
 	 * @dataProvider provideResolveMultivalueValue