summaryrefslogtreecommitdiff
path: root/includes/utils/MWFunction.php
diff options
context:
space:
mode:
Diffstat (limited to 'includes/utils/MWFunction.php')
-rw-r--r--includes/utils/MWFunction.php37
1 files changed, 7 insertions, 30 deletions
diff --git a/includes/utils/MWFunction.php b/includes/utils/MWFunction.php
index 3a0492dc..fa7eebe8 100644
--- a/includes/utils/MWFunction.php
+++ b/includes/utils/MWFunction.php
@@ -23,41 +23,18 @@
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
* @return object
+ * @deprecated 1.25 Use ObjectFactory::getObjectFromSpec() instead
*/
public static function newObj( $class, $args = array() ) {
- if ( !count( $args ) ) {
- return new $class;
- }
-
- $ref = new ReflectionClass( $class );
+ wfDeprecated( __METHOD__, '1.25' );
- return $ref->newInstanceArgs( $args );
+ return ObjectFactory::getObjectFromSpec( array(
+ 'class' => $class,
+ 'args' => $args,
+ 'closure_expansion' => false,
+ ) );
}
}