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
rdbms: make LoadBalancer::reallyOpenConnection() handle setting DBO_TRX
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
Revision
/
RevisionStoreDbTestBase.php
diff --git
a/tests/phpunit/includes/Revision/RevisionStoreDbTestBase.php
b/tests/phpunit/includes/Revision/RevisionStoreDbTestBase.php
index
d4393dd
..
ba2d28e
100644
(file)
--- a/
tests/phpunit/includes/Revision/RevisionStoreDbTestBase.php
+++ b/
tests/phpunit/includes/Revision/RevisionStoreDbTestBase.php
@@
-23,6
+23,7
@@
use MediaWiki\Storage\SqlBlobStore;
use MediaWiki\User\UserIdentityValue;
use MediaWikiTestCase;
use PHPUnit_Framework_MockObject_MockObject;
use MediaWiki\User\UserIdentityValue;
use MediaWikiTestCase;
use PHPUnit_Framework_MockObject_MockObject;
+use Psr\Log\NullLogger;
use Revision;
use TestUserRegistry;
use Title;
use Revision;
use TestUserRegistry;
use Title;
@@
-146,7
+147,7
@@
abstract class RevisionStoreDbTestBase extends MediaWikiTestCase {
->getMock();
$lb->method( 'reallyOpenConnection' )->willReturnCallback(
->getMock();
$lb->method( 'reallyOpenConnection' )->willReturnCallback(
- function (
array $server, $dbNameOverride
) {
+ function (
) use ( $server
) {
return $this->getDatabaseMock( $server );
}
);
return $this->getDatabaseMock( $server );
}
);
@@
-207,10
+208,11
@@
abstract class RevisionStoreDbTestBase extends MediaWikiTestCase {
'cliMode' => true,
'agent' => '',
'load' => 100,
'cliMode' => true,
'agent' => '',
'load' => 100,
+ 'srvCache' => new HashBagOStuff(),
'profiler' => null,
'trxProfiler' => new TransactionProfiler(),
'profiler' => null,
'trxProfiler' => new TransactionProfiler(),
- 'connLogger' => new
\Psr\Log\
NullLogger(),
- 'queryLogger' => new
\Psr\Log\
NullLogger(),
+ 'connLogger' => new NullLogger(),
+ 'queryLogger' => new NullLogger(),
'errorLogger' => function () {
},
'deprecationLogger' => function () {
'errorLogger' => function () {
},
'deprecationLogger' => function () {