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
Merge "Fix \n handling for HTMLUsersMultiselectField"
[lhc/web/wiklou.git]
/
includes
/
libs
/
ObjectFactory.php
diff --git
a/includes/libs/ObjectFactory.php
b/includes/libs/ObjectFactory.php
index
2ffc1d3
..
6c47c3c
100644
(file)
--- a/
includes/libs/ObjectFactory.php
+++ b/
includes/libs/ObjectFactory.php
@@
-21,8
+21,7
@@
/**
* Construct objects from configuration instructions.
*
/**
* Construct objects from configuration instructions.
*
- * @author Bryan Davis <bd808@wikimedia.org>
- * @copyright © 2014 Bryan Davis and Wikimedia Foundation.
+ * @copyright © 2014 Wikimedia Foundation and contributors
*/
class ObjectFactory {
*/
class ObjectFactory {
@@
-57,7
+56,7
@@
class ObjectFactory {
* constructor is non-public or non-existent
*/
public static function getObjectFromSpec( $spec ) {
* constructor is non-public or non-existent
*/
public static function getObjectFromSpec( $spec ) {
- $args = isset( $spec['args'] ) ? $spec['args'] :
array()
;
+ $args = isset( $spec['args'] ) ? $spec['args'] :
[]
;
$expandArgs = !isset( $spec['closure_expansion'] ) ||
$spec['closure_expansion'] === true;
$expandArgs = !isset( $spec['closure_expansion'] ) ||
$spec['closure_expansion'] === true;
@@
-86,7
+85,7
@@
class ObjectFactory {
if ( $expandArgs ) {
$margs = static::expandClosures( $margs );
}
if ( $expandArgs ) {
$margs = static::expandClosures( $margs );
}
- call_user_func_array(
array( $obj, $method )
, $margs );
+ call_user_func_array(
[ $obj, $method ]
, $margs );
}
}
}
}