From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Dec 2013 09:55:49 +0100
Subject: Update to MediaWiki 1.22.0

---
 tests/phpunit/includes/MWFunctionTest.php | 47 +------------------------------
 1 file changed, 1 insertion(+), 46 deletions(-)

(limited to 'tests/phpunit/includes/MWFunctionTest.php')

diff --git a/tests/phpunit/includes/MWFunctionTest.php b/tests/phpunit/includes/MWFunctionTest.php
index 6c17bf48..d86f2c9b 100644
--- a/tests/phpunit/includes/MWFunctionTest.php
+++ b/tests/phpunit/includes/MWFunctionTest.php
@@ -1,27 +1,7 @@
 <?php
 
 class MWFunctionTest extends MediaWikiTestCase {
-	function testCallUserFuncWorkarounds() {
-		$this->assertEquals(
-			call_user_func( array( 'MWFunctionTest', 'someMethod' ) ),
-			MWFunction::call( 'MWFunctionTest::someMethod' )
-		);
-		$this->assertEquals(
-			call_user_func( array( 'MWFunctionTest', 'someMethod' ), 'foo', 'bar', 'baz' ),
-			MWFunction::call( 'MWFunctionTest::someMethod', 'foo', 'bar', 'baz' )
-		);
-
-		$this->assertEquals(
-			call_user_func_array( array( 'MWFunctionTest', 'someMethod' ), array() ),
-			MWFunction::callArray( 'MWFunctionTest::someMethod', array() )
-		);
-		$this->assertEquals(
-			call_user_func_array( array( 'MWFunctionTest', 'someMethod' ), array( 'foo', 'bar', 'baz' ) ),
-			MWFunction::callArray( 'MWFunctionTest::someMethod', array( 'foo', 'bar', 'baz' ) )
-		);
-	}
-
-	function testNewObjFunction() {
+	public function testNewObjFunction() {
 		$arg1 = 'Foo';
 		$arg2 = 'Bar';
 		$arg3 = array( 'Baz' );
@@ -34,32 +14,7 @@ class MWFunctionTest extends MediaWikiTestCase {
 			MWFunction::newObj( 'MWBlankClass', $args )->args,
 			$newObject->args
 		);
-
-		$this->assertEquals(
-			MWFunction::newObj( 'MWBlankClass', $args, true )->args,
-			$newObject->args,
-			'Works even with PHP version < 5.1.3'
-		);
-	}
-
-	/**
-	 * @expectedException MWException
-	 */
-	function testCallingParentFails() {
-		MWFunction::call( 'parent::foo' );
 	}
-
-	/**
-	 * @expectedException MWException
-	 */
-	function testCallingSelfFails() {
-		MWFunction::call( 'self::foo' );
-	}
-
-	public static function someMethod() {
-		return func_get_args();
-	}
-
 }
 
 class MWBlankClass {
-- 
cgit v1.2.2