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
Allow int as return type of MediaHandler::isMetadataValid
[lhc/web/wiklou.git]
/
includes
/
MagicWordArray.php
diff --git
a/includes/MagicWordArray.php
b/includes/MagicWordArray.php
index
fde32ce
..
73d5173
100644
(file)
--- a/
includes/MagicWordArray.php
+++ b/
includes/MagicWordArray.php
@@
-49,10
+49,7
@@
class MagicWordArray {
*/
public function __construct( $names = [], MagicWordFactory $factory = null ) {
$this->names = $names;
*/
public function __construct( $names = [], MagicWordFactory $factory = null ) {
$this->names = $names;
- $this->factory = $factory;
- if ( !$factory ) {
- $this->factory = MediaWikiServices::getInstance()->getMagicWordFactory();
- }
+ $this->factory = $factory ?: MediaWikiServices::getInstance()->getMagicWordFactory();
}
/**
}
/**
@@
-268,10
+265,7
@@
class MagicWordArray {
return $hash[1][$text];
}
$lc = $this->factory->getContentLanguage()->lc( $text );
return $hash[1][$text];
}
$lc = $this->factory->getContentLanguage()->lc( $text );
- if ( isset( $hash[0][$lc] ) ) {
- return $hash[0][$lc];
- }
- return false;
+ return $hash[0][$lc] ?? false;
}
/**
}
/**