Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 0 insertions, 33 deletions

diff --git a/tests/phpunit/includes/MWFunctionTest.php b/tests/phpunit/includes/MWFunctionTest.php
deleted file mode 100644
index f2a720e8..00000000
--- a/tests/phpunit/includes/MWFunctionTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * @covers MWFunction
- */
-class MWFunctionTest extends MediaWikiTestCase {
-	public function testNewObjFunction() {
-		$arg1 = 'Foo';
-		$arg2 = 'Bar';
-		$arg3 = array( 'Baz' );
-		$arg4 = new ExampleObject;
-
-		$args = array( $arg1, $arg2, $arg3, $arg4 );
-
-		$newObject = new MWBlankClass( $arg1, $arg2, $arg3, $arg4 );
-		$this->assertEquals(
-			MWFunction::newObj( 'MWBlankClass', $args )->args,
-			$newObject->args
-		);
-	}
-}
-
-class MWBlankClass {
-
-	public $args = array();
-
-	function __construct( $arg1, $arg2, $arg3, $arg4 ) {
-		$this->args = array( $arg1, $arg2, $arg3, $arg4 );
-	}
-}
-
-class ExampleObject {
-}