Update to MediaWiki 1.25.1

1 files changed, 62 insertions, 6 deletions

diff --git a/tests/phpunit/includes/ImportTest.php b/tests/phpunit/includes/ImportTest.php
index 2fce6bfb..ea753e81 100644
--- a/tests/phpunit/includes/ImportTest.php
+++ b/tests/phpunit/includes/ImportTest.php
@@ -28,13 +28,14 @@ class ImportTest extends MediaWikiLangTestCase {
 		$source = $this->getInputStreamSource( $xml );
 
 		$redirect = null;
-		$callback = function ( $title, $origTitle, $revCount, $sRevCount, $pageInfo ) use ( &$redirect ) {
+		$callback = function ( Title $title, ForeignTitle $foreignTitle, $revCount,
+			$sRevCount, $pageInfo ) use ( &$redirect ) {
 			if ( array_key_exists( 'redirect', $pageInfo ) ) {
 				$redirect = $pageInfo['redirect'];
 			}
 		};
 
-		$importer = new WikiImporter( $source );
+		$importer = new WikiImporter( $source, ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) );
 		$importer->setPageOutCallback( $callback );
 		$importer->doImport();
 
@@ -45,7 +46,7 @@ class ImportTest extends MediaWikiLangTestCase {
 		return array(
 			array(
 				<<< EOF
-<mediawiki>
+<mediawiki xmlns="http://www.mediawiki.org/xml/export-0.10/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.mediawiki.org/xml/export-0.10/ http://www.mediawiki.org/xml/export-0.10.xsd" version="0.10" xml:lang="en">
 	<page>
 		<title>Test</title>
 		<ns>0</ns>
@@ -59,10 +60,10 @@ class ImportTest extends MediaWikiLangTestCase {
 				<id>10</id>
 			</contributor>
 			<comment>Admin moved page [[Test]] to [[Test22]]</comment>
-			<text xml:space="preserve" bytes="20">#REDIRECT [[Test22]]</text>
-			<sha1>tq456o9x3abm7r9ozi6km8yrbbc56o6</sha1>
 			<model>wikitext</model>
 			<format>text/x-wiki</format>
+			<text xml:space="preserve" bytes="20">#REDIRECT [[Test22]]</text>
+			<sha1>tq456o9x3abm7r9ozi6km8yrbbc56o6</sha1>
 		</revision>
 	</page>
 </mediawiki>
@@ -72,7 +73,7 @@ EOF
 			),
 			array(
 				<<< EOF
-<mediawiki>
+<mediawiki xmlns="http://www.mediawiki.org/xml/export-0.9/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.mediawiki.org/xml/export-0.9/ http://www.mediawiki.org/xml/export-0.9.xsd" version="0.9" xml:lang="en">
 	<page>
 		<title>Test</title>
 		<ns>0</ns>
@@ -98,4 +99,59 @@ EOF
 		);
 	}
 
+	/**
+	 * @covers WikiImporter::handleSiteInfo
+	 * @dataProvider getSiteInfoXML
+	 * @param string $xml
+	 * @param array|null $namespaces
+	 */
+	public function testSiteInfoContainsNamespaces( $xml, $namespaces ) {
+		$source = $this->getInputStreamSource( $xml );
+
+		$importNamespaces = null;
+		$callback = function ( array $siteinfo, $innerImporter ) use ( &$importNamespaces ) {
+			$importNamespaces = $siteinfo['_namespaces'];
+		};
+
+		$importer = new WikiImporter( $source, ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) );
+		$importer->setSiteInfoCallback( $callback );
+		$importer->doImport();
+
+		$this->assertEquals( $importNamespaces, $namespaces );
+	}
+
+	public function getSiteInfoXML() {
+		return array(
+			array(
+				<<< EOF
+<mediawiki xmlns="http://www.mediawiki.org/xml/export-0.10/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.mediawiki.org/xml/export-0.10/ http://www.mediawiki.org/xml/export-0.10.xsd" version="0.10" xml:lang="en">
+  <siteinfo>
+    <namespaces>
+      <namespace key="-2" case="first-letter">Media</namespace>
+      <namespace key="-1" case="first-letter">Special</namespace>
+      <namespace key="0" case="first-letter" />
+      <namespace key="1" case="first-letter">Talk</namespace>
+      <namespace key="2" case="first-letter">User</namespace>
+      <namespace key="3" case="first-letter">User talk</namespace>
+      <namespace key="100" case="first-letter">Portal</namespace>
+      <namespace key="101" case="first-letter">Portal talk</namespace>
+    </namespaces>
+  </siteinfo>
+</mediawiki>
+EOF
+			,
+				array(
+					'-2' => 'Media',
+					'-1' => 'Special',
+					'0' => '',
+					'1' => 'Talk',
+					'2' => 'User',
+					'3' => 'User talk',
+					'100' => 'Portal',
+					'101' => 'Portal talk',
+				)
+			),
+		);
+	}
+
 }