Update to MediaWiki 1.25.4

5 files changed, 191 insertions, 5 deletions

diff --git a/tests/phpunit/includes/MediaWikiTest.php b/tests/phpunit/includes/MediaWikiTest.php
new file mode 100644
index 00000000..df94d3e3
--- /dev/null
+++ b/tests/phpunit/includes/MediaWikiTest.php
@@ -0,0 +1,157 @@
+<?php
+
+class MediaWikiTest extends MediaWikiTestCase {
+	protected function setUp() {
+		parent::setUp();
+
+		$this->setMwGlobals( array(
+			'wgServer' => 'http://example.org',
+			'wgScriptPath' => '/w',
+			'wgScript' => '/w/index.php',
+			'wgArticlePath' => '/wiki/$1',
+			'wgActionPaths' => array(),
+		) );
+	}
+
+	public static function provideTryNormaliseRedirect() {
+		return array(
+			array(
+				// View: Canonical
+				'url' => 'http://example.org/wiki/Foo_Bar',
+				'query' => array(),
+				'title' => 'Foo_Bar',
+				'redirect' => false,
+			),
+			array(
+				// View: Escaped title
+				'url' => 'http://example.org/wiki/Foo%20Bar',
+				'query' => array(),
+				'title' => 'Foo_Bar',
+				'redirect' => 'http://example.org/wiki/Foo_Bar',
+			),
+			array(
+				// View: Script path
+				'url' => 'http://example.org/w/index.php?title=Foo_Bar',
+				'query' => array( 'title' => 'Foo_Bar' ),
+				'title' => 'Foo_Bar',
+				'redirect' => false,
+			),
+			array(
+				// View: Script path with implicit title from page id
+				'url' => 'http://example.org/w/index.php?curid=123',
+				'query' => array( 'curid' => '123' ),
+				'title' => 'Foo_Bar',
+				'redirect' => false,
+			),
+			array(
+				// View: Script path with implicit title from revision id
+				'url' => 'http://example.org/w/index.php?oldid=123',
+				'query' => array( 'oldid' => '123' ),
+				'title' => 'Foo_Bar',
+				'redirect' => false,
+			),
+			array(
+				// View: Script path without title
+				'url' => 'http://example.org/w/index.php',
+				'query' => array(),
+				'title' => 'Main_Page',
+				'redirect' => 'http://example.org/wiki/Main_Page',
+			),
+			array(
+				// View: Script path with empty title
+				'url' => 'http://example.org/w/index.php?title=',
+				'query' => array( 'title' => '' ),
+				'title' => 'Main_Page',
+				'redirect' => 'http://example.org/wiki/Main_Page',
+			),
+			array(
+				// View: Index with escaped title
+				'url' => 'http://example.org/w/index.php?title=Foo%20Bar',
+				'query' => array( 'title' => 'Foo Bar' ),
+				'title' => 'Foo_Bar',
+				'redirect' => 'http://example.org/wiki/Foo_Bar',
+			),
+			array(
+				// View: Script path with escaped title
+				'url' => 'http://example.org/w/?title=Foo_Bar',
+				'query' => array( 'title' => 'Foo_Bar' ),
+				'title' => 'Foo_Bar',
+				'redirect' => false,
+			),
+			array(
+				// View: Root path with escaped title
+				'url' => 'http://example.org/?title=Foo_Bar',
+				'query' => array( 'title' => 'Foo_Bar' ),
+				'title' => 'Foo_Bar',
+				'redirect' => false,
+			),
+			array(
+				// View: Canonical with redundant query
+				'url' => 'http://example.org/wiki/Foo_Bar?action=view',
+				'query' => array( 'action' => 'view' ),
+				'title' => 'Foo_Bar',
+				'redirect' => false,
+			),
+			array(
+				// Edit: Canonical view url with action query
+				'url' => 'http://example.org/wiki/Foo_Bar?action=edit',
+				'query' => array( 'action' => 'edit' ),
+				'title' => 'Foo_Bar',
+				'redirect' => false,
+			),
+			array(
+				// View: Index with action query
+				'url' => 'http://example.org/w/index.php?title=Foo_Bar&action=view',
+				'query' => array( 'title' => 'Foo_Bar', 'action' => 'view' ),
+				'title' => 'Foo_Bar',
+				'redirect' => false,
+			),
+			array(
+				// Edit: Index with action query
+				'url' => 'http://example.org/w/index.php?title=Foo_Bar&action=edit',
+				'query' => array( 'title' => 'Foo_Bar', 'action' => 'edit' ),
+				'title' => 'Foo_Bar',
+				'redirect' => false,
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideTryNormaliseRedirect
+	 * @covers MediaWiki::tryNormaliseRedirect
+	 */
+	public function testTryNormaliseRedirect( $url, $query, $title, $expectedRedirect = false ) {
+		// Set SERVER because interpolateTitle() doesn't use getRequestURL(),
+		// whereas tryNormaliseRedirect does().
+		$_SERVER['REQUEST_URI'] = $url;
+
+		$req = new FauxRequest( $query );
+		$req->setRequestURL( $url );
+		// This adds a virtual 'title' query parameter. Normally called from Setup.php
+		$req->interpolateTitle();
+
+		$titleObj = Title::newFromText( $title );
+
+		// Set global context since some involved code paths don't yet have context
+		$context = RequestContext::getMain();
+		$context->setRequest( $req );
+		$context->setTitle( $titleObj );
+
+		$mw = new MediaWiki( $context );
+
+		$method = new ReflectionMethod( $mw, 'tryNormaliseRedirect' );
+		$method->setAccessible( true );
+		$ret = $method->invoke( $mw, $titleObj );
+
+		$this->assertEquals(
+			$expectedRedirect !== false,
+			$ret,
+			'Return true only when redirecting'
+		);
+
+		$this->assertEquals(
+			$expectedRedirect ?: '',
+			$context->getOutput()->getRedirect()
+		);
+	}
+}
diff --git a/tests/phpunit/includes/parser/MediaWikiParserTest.php b/tests/phpunit/includes/parser/MediaWikiParserTest.php
index df891f5a..e6dbfc30 100644
--- a/tests/phpunit/includes/parser/MediaWikiParserTest.php
+++ b/tests/phpunit/includes/parser/MediaWikiParserTest.php
@@ -7,6 +7,7 @@ require_once __DIR__ . '/NewParserTest.php';
  * an PHPUnit_Framework_Test object
  *
  * @group Parser
+ * @group ParserTests
  * @group Database
  */
 class MediaWikiParserTest {
diff --git a/tests/phpunit/includes/parser/NewParserTest.php b/tests/phpunit/includes/parser/NewParserTest.php
index 91aad10c..7d21c4f7 100644
--- a/tests/phpunit/includes/parser/NewParserTest.php
+++ b/tests/phpunit/includes/parser/NewParserTest.php
@@ -670,6 +670,7 @@ class NewParserTest extends MediaWikiTestCase {
 
 	/**
 	 * @group medium
+	 * @group ParserTests
 	 * @dataProvider parserTestProvider
 	 * @param string $desc
 	 * @param string $input
diff --git a/tests/phpunit/includes/utils/IPTest.php b/tests/phpunit/includes/utils/IPTest.php
index 09c1587d..886ee908 100644
--- a/tests/phpunit/includes/utils/IPTest.php
+++ b/tests/phpunit/includes/utils/IPTest.php
@@ -270,12 +270,34 @@ class IPTest extends PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * Improve IP::sanitizeIP() code coverage
-	 * @todo Most probably incomplete
+	 * @covers IP::sanitizeIP
+	 * @dataProvider provideSanitizeIP
 	 */
-	public function testSanitizeIP() {
-		$this->assertNull( IP::sanitizeIP( '' ) );
-		$this->assertNull( IP::sanitizeIP( ' ' ) );
+	public function testSanitizeIP( $expected, $input ) {
+		$result = IP::sanitizeIP( $input );
+		$this->assertEquals( $expected, $result );
+	}
+
+	/**
+	 * Provider for IP::testSanitizeIP()
+	 */
+	public static function provideSanitizeIP() {
+		return array(
+			array( '0.0.0.0', '0.0.0.0' ),
+			array( '0.0.0.0', '00.00.00.00' ),
+			array( '0.0.0.0', '000.000.000.000' ),
+			array( '141.0.11.253', '141.000.011.253' ),
+			array( '1.2.4.5', '1.2.4.5' ),
+			array( '1.2.4.5', '01.02.04.05' ),
+			array( '1.2.4.5', '001.002.004.005' ),
+			array( '10.0.0.1', '010.0.000.1' ),
+			array( '80.72.250.4', '080.072.250.04' ),
+			array( 'Foo.1000.00', 'Foo.1000.00'),
+			array( 'Bar.01', 'Bar.01'),
+			array( 'Bar.010', 'Bar.010'),
+			array( null, ''),
+			array( null, ' ')
+		);
 	}
 
 	/**
@@ -299,6 +321,7 @@ class IPTest extends PHPUnit_Framework_TestCase {
 			array( '80000000', '128.0.0.0' ),
 			array( 'DEADCAFE', '222.173.202.254' ),
 			array( 'FFFFFFFF', '255.255.255.255' ),
+			array( '8D000BFD', '141.000.11.253' ),
 			array( false, 'IN.VA.LI.D' ),
 			array( 'v6-00000000000000000000000000000001', '::1' ),
 			array( 'v6-20010DB885A3000000008A2E03707334', '2001:0db8:85a3:0000:0000:8a2e:0370:7334' ),
diff --git a/tests/phpunit/suite.xml b/tests/phpunit/suite.xml
index 1acbc241..82086b9d 100644
--- a/tests/phpunit/suite.xml
+++ b/tests/phpunit/suite.xml
@@ -24,6 +24,10 @@ phpunit.php enables colors for other OSs at runtime
 		<testsuite name="languages">
 			<directory>languages</directory>
 		</testsuite>
+		<testsuite name="parsertests">
+			<file>includes/parser/MediaWikiParserTest.php</file>
+			<file>suites/ExtensionsParserTestSuite.php</file>
+		</testsuite>
 		<testsuite name="skins">
 			<directory>skins</directory>
 		</testsuite>