Update to MediaWiki 1.22.4

1 files changed, 0 insertions, 310 deletions

diff --git a/tests/phpunit/includes/WebRequestTest.php b/tests/phpunit/includes/WebRequestTest.php
deleted file mode 100644
index f8ed14b6..00000000
--- a/tests/phpunit/includes/WebRequestTest.php
+++ /dev/null
@@ -1,310 +0,0 @@
-<?php
-
-/**
- * @group WebRequest
- */
-class WebRequestTest extends MediaWikiTestCase {
-	protected $oldServer;
-
-	protected function setUp() {
-		parent::setUp();
-
-		$this->oldServer = $_SERVER;
-	}
-
-	protected function tearDown() {
-		$_SERVER = $this->oldServer;
-
-		parent::tearDown();
-	}
-
-	/**
-	 * @dataProvider provideDetectServer
-	 * @covers WebRequest::detectServer
-	 */
-	public function testDetectServer( $expected, $input, $description ) {
-		$_SERVER = $input;
-		$result = WebRequest::detectServer();
-		$this->assertEquals( $expected, $result, $description );
-	}
-
-	public static function provideDetectServer() {
-		return array(
-			array(
-				'http://x',
-				array(
-					'HTTP_HOST' => 'x'
-				),
-				'Host header'
-			),
-			array(
-				'https://x',
-				array(
-					'HTTP_HOST' => 'x',
-					'HTTPS' => 'on',
-				),
-				'Host header with secure'
-			),
-			array(
-				'http://x',
-				array(
-					'HTTP_HOST' => 'x',
-					'SERVER_PORT' => 80,
-				),
-				'Default SERVER_PORT',
-			),
-			array(
-				'http://x',
-				array(
-					'HTTP_HOST' => 'x',
-					'HTTPS' => 'off',
-				),
-				'Secure off'
-			),
-			array(
-				'http://y',
-				array(
-					'SERVER_NAME' => 'y',
-				),
-				'Server name'
-			),
-			array(
-				'http://x',
-				array(
-					'HTTP_HOST' => 'x',
-					'SERVER_NAME' => 'y',
-				),
-				'Host server name precedence'
-			),
-			array(
-				'http://[::1]:81',
-				array(
-					'HTTP_HOST' => '[::1]',
-					'SERVER_NAME' => '::1',
-					'SERVER_PORT' => '81',
-				),
-				'Apache bug 26005'
-			),
-			array(
-				'http://localhost',
-				array(
-					'SERVER_NAME' => '[2001'
-				),
-				'Kind of like lighttpd per commit message in MW r83847',
-			),
-			array(
-				'http://[2a01:e35:2eb4:1::2]:777',
-				array(
-					'SERVER_NAME' => '[2a01:e35:2eb4:1::2]:777'
-				),
-				'Possible lighttpd environment per bug 14977 comment 13',
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider provideGetIP
-	 * @covers WebRequest::getIP
-	 */
-	public function testGetIP( $expected, $input, $squid, $xffList, $private, $description ) {
-		$_SERVER = $input;
-		$this->setMwGlobals( array(
-			'wgSquidServersNoPurge' => $squid,
-			'wgUsePrivateIPs' => $private,
-			'wgHooks' => array(
-				'IsTrustedProxy' => array(
-					function( &$ip, &$trusted ) use ( $xffList ) {
-						$trusted = $trusted || in_array( $ip, $xffList );
-						return true;
-					}
-				)
-			)
-		) );
-
-		$request = new WebRequest();
-		$result = $request->getIP();
-		$this->assertEquals( $expected, $result, $description );
-	}
-
-	public static function provideGetIP() {
-		return array(
-			array(
-				'127.0.0.1',
-				array(
-					'REMOTE_ADDR' => '127.0.0.1'
-				),
-				array(),
-				array(),
-				false,
-				'Simple IPv4'
-			),
-			array(
-				'::1',
-				array(
-					'REMOTE_ADDR' => '::1'
-				),
-				array(),
-				array(),
-				false,
-				'Simple IPv6'
-			),
-			array(
-				'12.0.0.1',
-				array(
-					'REMOTE_ADDR' => 'abcd:0001:002:03:4:555:6666:7777',
-					'HTTP_X_FORWARDED_FOR' => '12.0.0.1, abcd:0001:002:03:4:555:6666:7777',
-				),
-				array( 'ABCD:1:2:3:4:555:6666:7777' ),
-				array(),
-				false,
-				'IPv6 normalisation'
-			),
-			array(
-				'12.0.0.3',
-				array(
-					'REMOTE_ADDR' => '12.0.0.1',
-					'HTTP_X_FORWARDED_FOR' => '12.0.0.3, 12.0.0.2'
-				),
-				array( '12.0.0.1', '12.0.0.2' ),
-				array(),
-				false,
-				'With X-Forwaded-For'
-			),
-			array(
-				'12.0.0.1',
-				array(
-					'REMOTE_ADDR' => '12.0.0.1',
-					'HTTP_X_FORWARDED_FOR' => '12.0.0.3, 12.0.0.2'
-				),
-				array(),
-				array(),
-				false,
-				'With X-Forwaded-For and disallowed server'
-			),
-			array(
-				'12.0.0.2',
-				array(
-					'REMOTE_ADDR' => '12.0.0.1',
-					'HTTP_X_FORWARDED_FOR' => '12.0.0.3, 12.0.0.2'
-				),
-				array( '12.0.0.1' ),
-				array(),
-				false,
-				'With multiple X-Forwaded-For and only one allowed server'
-			),
-			array(
-				'10.0.0.3',
-				array(
-					'REMOTE_ADDR' => '12.0.0.2',
-					'HTTP_X_FORWARDED_FOR' => '10.0.0.4, 10.0.0.3, 12.0.0.2'
-				),
-				array( '12.0.0.1', '12.0.0.2' ),
-				array(),
-				false,
-				'With X-Forwaded-For and private IP (from cache proxy)'
-			),
-			array(
-				'10.0.0.4',
-				array(
-					'REMOTE_ADDR' => '12.0.0.2',
-					'HTTP_X_FORWARDED_FOR' => '10.0.0.4, 10.0.0.3, 12.0.0.2'
-				),
-				array( '12.0.0.1', '12.0.0.2', '10.0.0.3' ),
-				array(),
-				true,
-				'With X-Forwaded-For and private IP (allowed)'
-			),
-			array(
-				'10.0.0.4',
-				array(
-					'REMOTE_ADDR' => '12.0.0.2',
-					'HTTP_X_FORWARDED_FOR' => '10.0.0.4, 10.0.0.3, 12.0.0.2'
-				),
-				array( '12.0.0.1', '12.0.0.2' ),
-				array( '10.0.0.3' ),
-				true,
-				'With X-Forwaded-For and private IP (allowed)'
-			),
-			array(
-				'10.0.0.3',
-				array(
-					'REMOTE_ADDR' => '12.0.0.2',
-					'HTTP_X_FORWARDED_FOR' => '10.0.0.4, 10.0.0.3, 12.0.0.2'
-				),
-				array( '12.0.0.1', '12.0.0.2' ),
-				array( '10.0.0.3' ),
-				false,
-				'With X-Forwaded-For and private IP (disallowed)'
-			),
-			array(
-				'12.0.0.3',
-				array(
-					'REMOTE_ADDR' => '12.0.0.1',
-					'HTTP_X_FORWARDED_FOR' => '12.0.0.3, 12.0.0.2'
-				),
-				array(),
-				array( '12.0.0.1', '12.0.0.2' ),
-				false,
-				'With X-Forwaded-For'
-			),
-			array(
-				'12.0.0.2',
-				array(
-					'REMOTE_ADDR' => '12.0.0.1',
-					'HTTP_X_FORWARDED_FOR' => '12.0.0.3, 12.0.0.2'
-				),
-				array(),
-				array( '12.0.0.1' ),
-				false,
-				'With multiple X-Forwaded-For and only one allowed server'
-			),
-			array(
-				'12.0.0.2',
-				array(
-					'REMOTE_ADDR' => '12.0.0.2',
-					'HTTP_X_FORWARDED_FOR' => '10.0.0.3, 12.0.0.2'
-				),
-				array(),
-				array( '12.0.0.2' ),
-				false,
-				'With X-Forwaded-For and private IP and hook (disallowed)'
-			),
-		);
-	}
-
-	/**
-	 * @expectedException MWException
-	 * @covers WebRequest::getIP
-	 */
-	public function testGetIpLackOfRemoteAddrThrowAnException() {
-		$request = new WebRequest();
-		# Next call throw an exception about lacking an IP
-		$request->getIP();
-	}
-
-	public static function provideLanguageData() {
-		return array(
-			array( '', array(), 'Empty Accept-Language header' ),
-			array( 'en', array( 'en' => 1 ), 'One language' ),
-			array( 'en, ar', array( 'en' => 1, 'ar' => 1 ), 'Two languages listed in appearance order.' ),
-			array( 'zh-cn,zh-tw', array( 'zh-cn' => 1, 'zh-tw' => 1 ), 'Two equally prefered languages, listed in appearance order per rfc3282. Checks c9119' ),
-			array( 'es, en; q=0.5', array( 'es' => 1, 'en' => '0.5' ), 'Spanish as first language and English and second' ),
-			array( 'en; q=0.5, es', array( 'es' => 1, 'en' => '0.5' ), 'Less prefered language first' ),
-			array( 'fr, en; q=0.5, es', array( 'fr' => 1, 'es' => 1, 'en' => '0.5' ), 'Three languages' ),
-			array( 'en; q=0.5, es', array( 'es' => 1, 'en' => '0.5' ), 'Two languages' ),
-			array( 'en, zh;q=0', array( 'en' => 1 ), "It's Chinese to me" ),
-			array( 'es; q=1, pt;q=0.7, it; q=0.6, de; q=0.1, ru;q=0', array( 'es' => '1', 'pt' => '0.7', 'it' => '0.6', 'de' => '0.1' ), 'Preference for romance languages' ),
-			array( 'en-gb, en-us; q=1', array( 'en-gb' => 1, 'en-us' => '1' ), 'Two equally prefered English variants' ),
-		);
-	}
-
-	/**
-	 * @dataProvider provideLanguageData
-	 * @covers WebRequest::getAcceptLang
-	 */
-	public function testAcceptLang( $acceptLanguageHeader, $expectedLanguages, $description ) {
-		$_SERVER = array( 'HTTP_ACCEPT_LANGUAGE' => $acceptLanguageHeader );
-		$request = new WebRequest();
-		$this->assertSame( $request->getAcceptLang(), $expectedLanguages, $description );
-	}
-}