From d9022f63880ce039446fba8364f68e656b7bf4cb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 3 May 2012 13:01:35 +0200
Subject: Update to MediaWiki 1.19.0

---
 .../includes/media/SVGMetadataExtractorTest.php    | 24 +++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'tests/phpunit/includes/media/SVGMetadataExtractorTest.php')

diff --git a/tests/phpunit/includes/media/SVGMetadataExtractorTest.php b/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
index c2c81b98..526beae8 100644
--- a/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
+++ b/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
@@ -62,23 +62,33 @@ class SVGMetadataExtractorTest extends MediaWikiTestCase {
 					'height' => 60
 				)
 			),
+			array(
+				"$base/Toll_Texas_1.svg",
+				// This file triggered bug 31719, needs entity expansion in the xmlns checks
+				array(
+					'width' => 385,
+					'height' => 385
+				)
+			)
 		);
 	}
 
 	function providerSvgFilesWithXMLMetadata() {
 		$base = dirname( __FILE__ ) . '/../../data/media';
-		return array(
-			array(
-				"$base/US_states_by_total_state_tax_revenue.svg",
-				array(
-					'height' => 593,
-					'metadata' =>
+		$metadata = 
     '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
       <ns4:Work xmlns:ns4="http://creativecommons.org/ns#" rdf:about="">
         <ns5:format xmlns:ns5="http://purl.org/dc/elements/1.1/">image/svg+xml</ns5:format>
         <ns5:type xmlns:ns5="http://purl.org/dc/elements/1.1/" rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
       </ns4:Work>
-    </rdf:RDF>',
+    </rdf:RDF>';
+		$metadata = str_replace( "\r", '', $metadata ); // Windows compat
+		return array(
+			array(
+				"$base/US_states_by_total_state_tax_revenue.svg",
+				array(
+					'height' => 593,
+					'metadata' => $metadata,
 					'width' => 959
 				)
 			),
-- 
cgit v1.2.3-54-g00ecf