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 "logging: Replace deprecated use of CommentStore::getStore()"
[lhc/web/wiklou.git]
/
tests
/
parser
/
ParserTestRunner.php
diff --git
a/tests/parser/ParserTestRunner.php
b/tests/parser/ParserTestRunner.php
index
699de95
..
b40b769
100644
(file)
--- a/
tests/parser/ParserTestRunner.php
+++ b/
tests/parser/ParserTestRunner.php
@@
-388,10
+388,10
@@
class ParserTestRunner {
100 => 'MemoryAlpha',
101 => 'MemoryAlpha_talk'
];
100 => 'MemoryAlpha',
101 => 'MemoryAlpha_talk'
];
- // Changing wgExtraNamespaces invalidates caches in
MWNamespace and
- //
any live Language
object, both on setup and teardown
+ // Changing wgExtraNamespaces invalidates caches in
NamespaceInfo and any live Language
+ // object, both on setup and teardown
$reset = function () {
$reset = function () {
- M
WNamespace::clearCaches(
);
+ M
ediaWikiServices::getInstance()->resetServiceForTesting( 'NamespaceInfo'
);
MediaWikiServices::getInstance()->getContentLanguage()->resetNamespaces();
};
$setup[] = $reset;
MediaWikiServices::getInstance()->getContentLanguage()->resetNamespaces();
};
$setup[] = $reset;
@@
-938,12
+938,7
@@
class ParserTestRunner {
*/
private static function getOptionValue( $key, $opts, $default ) {
$key = strtolower( $key );
*/
private static function getOptionValue( $key, $opts, $default ) {
$key = strtolower( $key );
-
- if ( isset( $opts[$key] ) ) {
- return $opts[$key];
- } else {
- return $default;
- }
+ return $opts[$key] ?? $default;
}
/**
}
/**