dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move MWGrants out of utils
[lhc/web/wiklou.git]
/
includes
/
StubObject.php
diff --git
a/includes/StubObject.php
b/includes/StubObject.php
index
0b4d048
..
0210ed9
100644
(file)
--- a/
includes/StubObject.php
+++ b/
includes/StubObject.php
@@
-48,6
+48,9
@@
class StubObject {
/** @var null|string */
protected $class;
/** @var null|string */
protected $class;
+ /** @var null|callable */
+ protected $factory;
+
/** @var array */
protected $params;
/** @var array */
protected $params;
@@
-55,12
+58,17
@@
class StubObject {
* Constructor.
*
* @param string $global Name of the global variable.
* 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;
* @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;
}
$this->params = $params;
}
@@
-110,8
+118,10
@@
class StubObject {
* @return object
*/
public function _newObject() {
* @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,
] );
'args' => $this->params,
'closure_expansion' => false,
] );