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 "Make phpunit.php less hackish, and install the listener unconditionally"
[lhc/web/wiklou.git]
/
tests
/
common
/
TestSetup.php
diff --git
a/tests/common/TestSetup.php
b/tests/common/TestSetup.php
index
38f56d2
..
2feb438
100644
(file)
--- a/
tests/common/TestSetup.php
+++ b/
tests/common/TestSetup.php
@@
-39,7
+39,7
@@
class TestSetup {
$wgMainStash = 'hash';
// Use memory job queue
$wgJobTypeConf = [
$wgMainStash = 'hash';
// Use memory job queue
$wgJobTypeConf = [
- 'default' => [ 'class' =>
'JobQueueMemory'
, 'order' => 'fifo' ],
+ 'default' => [ 'class' =>
JobQueueMemory::class
, 'order' => 'fifo' ],
];
$wgUseDatabaseMessages = false; # Set for future resets
];
$wgUseDatabaseMessages = false; # Set for future resets
@@
-47,10
+47,10
@@
class TestSetup {
// Assume UTC for testing purposes
$wgLocaltimezone = 'UTC';
// Assume UTC for testing purposes
$wgLocaltimezone = 'UTC';
- $wgLocalisationCacheConf['storeClass'] =
'LCStoreNull'
;
+ $wgLocalisationCacheConf['storeClass'] =
LCStoreNull::class
;
// Do not bother updating search tables
// Do not bother updating search tables
- $wgSearchType =
'SearchEngineDummy'
;
+ $wgSearchType =
SearchEngineDummy::class
;
// Generic MediaWiki\Session\SessionManager configuration for tests
// We use CookieSessionProvider because things might be expecting
// Generic MediaWiki\Session\SessionManager configuration for tests
// We use CookieSessionProvider because things might be expecting
@@
-89,7
+89,7
@@
class TestSetup {
];
$wgAuth = new MediaWiki\Auth\AuthManagerAuthPlugin();
];
$wgAuth = new MediaWiki\Auth\AuthManagerAuthPlugin();
- //
Bug 44
192 Do not attempt to send a real e-mail
+ //
T46
192 Do not attempt to send a real e-mail
Hooks::clear( 'AlternateUserMailer' );
Hooks::register(
'AlternateUserMailer',
Hooks::clear( 'AlternateUserMailer' );
Hooks::register(
'AlternateUserMailer',
@@
-104,10
+104,6
@@
class TestSetup {
// may break testing against floating point values
// treated with PHP's serialize()
ini_set( 'serialize_precision', 17 );
// may break testing against floating point values
// treated with PHP's serialize()
ini_set( 'serialize_precision', 17 );
-
- // TODO: we should call MediaWikiTestCase::prepareServices( new GlobalVarConfig() ) here.
- // But PHPUnit may not be loaded yet, so we have to wait until just
- // before PHPUnit_TextUI_Command::main() is executed.
}
}
}
}