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 "RCFilters: Fix highlight circle misalignment"
[lhc/web/wiklou.git]
/
tests
/
parser
/
ParserTestRunner.php
diff --git
a/tests/parser/ParserTestRunner.php
b/tests/parser/ParserTestRunner.php
index
e578418
..
97c3c05
100644
(file)
--- a/
tests/parser/ParserTestRunner.php
+++ b/
tests/parser/ParserTestRunner.php
@@
-341,8
+341,9
@@
class ParserTestRunner {
MediaWikiServices::getInstance()->disableService( 'MediaHandlerFactory' );
MediaWikiServices::getInstance()->redefineService(
'MediaHandlerFactory',
MediaWikiServices::getInstance()->disableService( 'MediaHandlerFactory' );
MediaWikiServices::getInstance()->redefineService(
'MediaHandlerFactory',
- function () {
- return new MockMediaHandlerFactory();
+ function ( MediaWikiServices $services ) {
+ $handlers = $services->getMainConfig()->get( 'ParserTestMediaHandlers' );
+ return new MediaHandlerFactory( $handlers );
}
);
$teardown[] = function () {
}
);
$teardown[] = function () {
@@
-477,7
+478,7
@@
class ParserTestRunner {
* @see staticSetup
*
* @param array $teardown The snippet array
* @see staticSetup
*
* @param array $teardown The snippet array
- * @param ScopedCallback|null A ScopedCallback to consume
+ * @param ScopedCallback|null
$nextTeardown
A ScopedCallback to consume
* @return ScopedCallback
*/
protected function createTeardownObject( $teardown, $nextTeardown = null ) {
* @return ScopedCallback
*/
protected function createTeardownObject( $teardown, $nextTeardown = null ) {
@@
-526,7
+527,7
@@
class ParserTestRunner {
* Determine whether a particular setup function has been run
*
* @param string $funcName
* Determine whether a particular setup function has been run
*
* @param string $funcName
- * @return bool
ean
+ * @return bool
*/
public function isSetupDone( $funcName ) {
return isset( $this->setupDone[$funcName] ) ? $this->setupDone[$funcName] : false;
*/
public function isSetupDone( $funcName ) {
return isset( $this->setupDone[$funcName] ) ? $this->setupDone[$funcName] : false;
@@
-1529,7
+1530,7
@@
class ParserTestRunner {
/**
* Add articles to the test DB.
*
/**
* Add articles to the test DB.
*
- * @param $articles Article info array from TestFileReader
+ * @param
array
$articles Article info array from TestFileReader
*/
public function addArticles( $articles ) {
global $wgContLang;
*/
public function addArticles( $articles ) {
global $wgContLang;