X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FStubObject.php;h=211afda671c14f3ad99f3bda4dad17f95d00312a;hb=327f0a9f6f1d6a80ae5b3c741340efb172b75432;hp=2dfcdc2f497b45f84718913dfc16ceb02fd84ab5;hpb=dd8c1e2dd3feb9c5c6bd79d2a8a3356666792d0c;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/StubObject.php b/includes/StubObject.php index 2dfcdc2f49..211afda671 100644 --- 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, - ) ); + ] ); } /** @@ -165,9 +165,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 +173,6 @@ class StubUserLang extends StubObject { parent::__construct( 'wgLang' ); } - public function __call( $name, $args ) { - return $this->_call( $name, $args ); - } - /** * Call Language::findVariantLink after unstubbing $wgLang. * @@ -194,7 +188,7 @@ class StubUserLang extends StubObject { public function findVariantLink( &$link, &$nt, $ignoreOtherCond = false ) { global $wgLang; $this->_unstub( 'findVariantLink', 3 ); - return $wgLang->findVariantLink( $link, $nt, $ignoreOtherCond ); + $wgLang->findVariantLink( $link, $nt, $ignoreOtherCond ); } /**