From 96a16f2e80f1de9beae5be338e57586c4c392769 Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@gmail.com>
Date: Wed, 5 Nov 2014 14:39:03 -0800
Subject: [PATCH] Remove deprecated functions from MWFunction

* MWFunction::call()
* MWFunction::callArray()

Change-Id: I9b3acd59bc85d54298711e596397b61e4deeff75
---
 RELEASE-NOTES-1.25            |  2 ++
 includes/utils/MWFunction.php | 24 ------------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index aa0d5a7b16..b649c2b3f5 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -180,6 +180,8 @@ changes to languages because of Bugzilla reports.
   tag, instead of after the <text> and <sha1> tags.
   The new schema version is 0.10, the new schema URI is
   <https://www.mediawiki.org/xml/export-0.10.xsd>.
+* MWFunction::call() and MWFunction::callArray() were removed, having being
+  deprecated in 1.22.
 
 == Compatibility ==
 
diff --git a/includes/utils/MWFunction.php b/includes/utils/MWFunction.php
index 3a0492dc20..9fb4c198e5 100644
--- a/includes/utils/MWFunction.php
+++ b/includes/utils/MWFunction.php
@@ -22,30 +22,6 @@
 
 class MWFunction {
 
-	/**
-	 * @deprecated since 1.22; use call_user_func()
-	 * @param callable $callback
-	 * @return mixed
-	 */
-	public static function call( $callback ) {
-		wfDeprecated( __METHOD__, '1.22' );
-		$args = func_get_args();
-
-		return call_user_func_array( 'call_user_func', $args );
-	}
-
-	/**
-	 * @deprecated since 1.22; use call_user_func_array()
-	 * @param callable $callback
-	 * @param array $argsarams
-	 * @return mixed
-	 */
-	public static function callArray( $callback, $argsarams ) {
-		wfDeprecated( __METHOD__, '1.22' );
-
-		return call_user_func_array( $callback, $argsarams );
-	}
-
 	/**
 	 * @param string $class
 	 * @param array $args
-- 
2.20.1