Remove deprecated functions from MWFunction

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

Change-Id: I9b3acd59bc85d54298711e596397b61e4deeff75

diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index aa0d5a7..b649c2b 100644 (file)
--- 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 3a0492d..9fb4c19 100644 (file)
--- 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