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 "tests: Avoid namespace slashes in getNewTempFile() utility"
[lhc/web/wiklou.git]
/
tests
/
parser
/
ParserTestRunner.php
diff --git
a/tests/parser/ParserTestRunner.php
b/tests/parser/ParserTestRunner.php
index
606bedb
..
df897d9
100644
(file)
--- a/
tests/parser/ParserTestRunner.php
+++ b/
tests/parser/ParserTestRunner.php
@@
-289,9
+289,14
@@
class ParserTestRunner {
// All FileRepo changes should be done here by injecting services,
// there should be no need to change global variables.
// All FileRepo changes should be done here by injecting services,
// there should be no need to change global variables.
- RepoGroup::setSingleton( $this->createRepoGroup() );
+ MediaWikiServices::getInstance()->disableService( 'RepoGroup' );
+ MediaWikiServices::getInstance()->redefineService( 'RepoGroup',
+ function () {
+ return $this->createRepoGroup();
+ }
+ );
$teardown[] = function () {
$teardown[] = function () {
-
RepoGroup::destroySingleton(
);
+
MediaWikiServices::getInstance()->resetServiceForTesting( 'RepoGroup'
);
};
// Set up null lock managers
};
// Set up null lock managers
@@
-449,7
+454,8
@@
class ParserTestRunner {
'transformVia404' => false,
'backend' => $backend
],
'transformVia404' => false,
'backend' => $backend
],
- []
+ [],
+ MediaWikiServices::getInstance()->getMainWANObjectCache()
);
}
);
}