ImageListPager: Don't fatal when unable to thumbnail a file

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

diff --git a/includes/StubObject.php b/includes/StubObject.php
index 49155d6..0b4d048 100644 (file)
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -58,7 +58,7 @@ class StubObject {
         * @param string $class Name of the class of the real object.
         * @param array $params Parameters to pass to constructor of the real object.
         */
-       public function __construct( $global = null, $class = null, $params = array() ) {
+       public function __construct( $global = null, $class = null, $params = [] ) {
                $this->global = $global;
                $this->class = $class;
                $this->params = $params;
@@ -102,7 +102,7 @@ class StubObject {
         */
        public function _call( $name, $args ) {
                $this->_unstub( $name, 5 );
-               return call_user_func_array( array( $GLOBALS[$this->global], $name ), $args );
+               return call_user_func_array( [ $GLOBALS[$this->global], $name ], $args );
        }
 
        /**
@@ -110,11 +110,11 @@ class StubObject {
         * @return object
         */
        public function _newObject() {
-               return ObjectFactory::getObjectFromSpec( array(
+               return ObjectFactory::getObjectFromSpec( [
                        'class' => $this->class,
                        'args' => $this->params,
                        'closure_expansion' => false,
-               ) );
+               ] );
        }
 
        /**
@@ -149,7 +149,6 @@ class StubObject {
                }
 
                if ( get_class( $GLOBALS[$this->global] ) != $this->class ) {
-                       $fname = __METHOD__ . '-' . $this->global;
                        $caller = wfGetCaller( $level );
                        if ( ++$recursionLevel > 2 ) {
                                throw new MWException( "Unstub loop detected on call of "
@@ -165,9 +164,7 @@ class StubObject {
 }
 
 /**
- * Stub object for the user language. It depends of the user preferences and
- * "uselang" parameter that can be passed to index.php. This object have to be
- * in $wgLang global.
+ * Stub object for the user language. Assigned to the $wgLang global.
  */
 class StubUserLang extends StubObject {
 
@@ -175,10 +172,6 @@ class StubUserLang extends StubObject {
                parent::__construct( 'wgLang' );
        }
 
-       public function __call( $name, $args ) {
-               return $this->_call( $name, $args );
-       }
-
        /**
         * Call Language::findVariantLink after unstubbing $wgLang.
         *