X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FStubObject.php;h=0210ed9d6a813b1707c218a21d324952f9ff3d84;hb=80847dcb32f4f6ecf198d3ff4c8bc71333832c75;hp=211afda671c14f3ad99f3bda4dad17f95d00312a;hpb=c5f4cd0ad118ff38ded74fe882e997052452e77b;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/StubObject.php b/includes/StubObject.php index 211afda671..0210ed9d6a 100644 --- a/includes/StubObject.php +++ b/includes/StubObject.php @@ -48,6 +48,9 @@ class StubObject { /** @var null|string */ protected $class; + /** @var null|callable */ + protected $factory; + /** @var array */ protected $params; @@ -55,12 +58,17 @@ class StubObject { * Constructor. * * @param string $global Name of the global variable. - * @param string $class Name of the class of the real object. + * @param string|callable $class Name of the class of the real object + * or a factory function to call * @param array $params Parameters to pass to constructor of the real object. */ public function __construct( $global = null, $class = null, $params = [] ) { $this->global = $global; - $this->class = $class; + if ( is_callable( $class ) ) { + $this->factory = $class; + } else { + $this->class = $class; + } $this->params = $params; } @@ -110,8 +118,10 @@ class StubObject { * @return object */ public function _newObject() { - return ObjectFactory::getObjectFromSpec( [ - 'class' => $this->class, + $params = $this->factory + ? [ 'factory' => $this->factory ] + : [ 'class' => $this->class ]; + return ObjectFactory::getObjectFromSpec( $params + [ 'args' => $this->params, 'closure_expansion' => false, ] ); @@ -149,7 +159,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 "