Possible error messages for action=createaccount should be in English and not show...

[lhc/web/wiklou.git] / includes / MWFunction.php

diff --git a/includes/MWFunction.php b/includes/MWFunction.php
index b3e79de..6d11d17 100644 (file)
--- a/includes/MWFunction.php
+++ b/includes/MWFunction.php
@@ -1,6 +1,7 @@
 <?php
-
 /**
+ * Helper methods to call functions and instance objects.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -16,118 +17,45 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
+ * @file
  */
 
 class MWFunction {
-       
-       protected static function cleanCallback( $callback ) {
-               
-               if( is_string( $callback ) ) {
-                       if ( strpos( $callback, '::' ) !== false ) {
-                               //PHP 5.1 cannot use call_user_func( 'Class::Method' )
-                               //It can only handle only call_user_func( array( 'Class', 'Method' ) )
-                               $callback = explode( '::', $callback, 2);
-                       }
-               }
-               
-               return $callback;
-       }
-       
+
+       /**
+        * @deprecated since 1.22; use call_user_func()
+        * @param $callback
+        * @return mixed
+        */
        public static function call( $callback ) {
-               $callback = self::cleanCallback( $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 $callback
+        * @param $argsarams
+        * @return mixed
+        */
        public static function callArray( $callback, $argsarams ) {
-       
-               $callback = self::cleanCallback( $callback );
+               wfDeprecated( __METHOD__, '1.22' );
                return call_user_func_array( $callback, $argsarams );
-               
        }
-       
-       public static function newObj( $class, $args = array(), $force_fallback = false ) {
-               if( !count( $args ) ) {
+
+       /**
+        * @param $class
+        * @param $args array
+        * @return object
+        */
+       public static function newObj( $class, $args = array() ) {
+               if ( !count( $args ) ) {
                        return new $class;
                }
-               
-               if ( version_compare( PHP_VERSION, '5.1.3', '<' ) || $force_fallback ) {
-               
-                       //If only MW needed 5.1.3 and up... sigh
-                       
-                       $args = array_values( $args );
-                       switch ( count( $args ) ) {
-                               case 0:
-                                       return new $class;
-                               case 1:
-                                       return new $class( $args[0] );
-                               case 2:
-                                       return new $class( $args[0], $args[1] );
-                               case 3:
-                                       return new $class( $args[0], $args[1], $args[2] );
-                               case 4:
-                                       return new $class( $args[0], $args[1], $args[2], $args[3] );
-                               case 5:
-                                       return new $class( $args[0], $args[1], $args[2], $args[3], $args[4] );
-                               case 6:
-                                       return new $class( $args[0], $args[1], $args[2], $args[3], $args[4], $args[5] );
-                               case 7:
-                                       return new $class( $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6] );
-                               case 8:
-                                       return new $class( 
-                                               $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6], 
-                                               $args[7] 
-                                       );
-                               case 9:
-                                       return new $class( 
-                                               $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6], 
-                                               $args[7], $args[8] 
-                                       );
-                               case 10:
-                                       return new $class( 
-                                               $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6], 
-                                               $args[7], $args[8], $args[9]
-                                       );
-                               case 11:
-                                       return new $class( 
-                                               $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6], 
-                                               $args[7], $args[8], $args[9], $args[10] 
-                                       );
-                               case 12:
-                                       return new $class( 
-                                               $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6], 
-                                               $args[7], $args[8], $args[9], $args[10], $args[11] 
-                                       );
-                               case 13:
-                                       return new $class( 
-                                               $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6], 
-                                               $args[7], $args[8], $args[9], $args[10], $args[11], $args[12]
-                                       );
-                               case 14:
-                                       return new $class( 
-                                               $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6], 
-                                               $args[7], $args[8], $args[9], $args[10], $args[11], $args[12], $args[13]
-                                       );
-                               case 15:
-                                       return new $class( 
-                                               $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6], 
-                                               $args[7], $args[8], $args[9], $args[10], $args[11], $args[12], $args[13], 
-                                               $args[14]
-                                       );
-                               default:
-                                       throw new MWException( 'Too many arguments to construtor in MWFunction::newObj' );
-                       }
-               }
-       
-               else {
-       
-                       $ref = new ReflectionClass($class); 
-                       return $ref->newInstanceArgs($args);
-               }
-               
+
+               $ref = new ReflectionClass( $class );
+               return $ref->newInstanceArgs( $args );
        }
-       
+
 }