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
Update suppressWarning()/restoreWarning() calls
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
MediaWikiTestCase.php
diff --git
a/tests/phpunit/MediaWikiTestCase.php
b/tests/phpunit/MediaWikiTestCase.php
index
fe8c917
..
817f161
100644
(file)
--- a/
tests/phpunit/MediaWikiTestCase.php
+++ b/
tests/phpunit/MediaWikiTestCase.php
@@
-267,7
+267,6
@@
abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
CACHE_MEMCACHED => $hashCache,
'apc' => $hashCache,
'apcu' => $hashCache,
CACHE_MEMCACHED => $hashCache,
'apc' => $hashCache,
'apcu' => $hashCache,
- 'xcache' => $hashCache,
'wincache' => $hashCache,
] + $baseConfig->get( 'ObjectCaches' );
'wincache' => $hashCache,
] + $baseConfig->get( 'ObjectCaches' );
@@
-1080,6
+1079,8
@@
abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
}
}
}
}
+ SiteStatsInit::doPlaceholderInit();
+
User::resetIdByNameCache();
// Make sysop user
User::resetIdByNameCache();
// Make sysop user
@@
-1596,9
+1597,9
@@
abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
* @param string $function
*/
public function hideDeprecated( $function ) {
* @param string $function
*/
public function hideDeprecated( $function ) {
-
MediaWiki
\suppressWarnings();
+
Wikimedia
\suppressWarnings();
wfDeprecated( $function );
wfDeprecated( $function );
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
}
/**
}
/**
@@
-1892,9
+1893,9
@@
abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
# This check may also protect against code injection in
# case of broken installations.
# This check may also protect against code injection in
# case of broken installations.
-
MediaWiki
\suppressWarnings();
+
Wikimedia
\suppressWarnings();
$haveDiff3 = $wgDiff3 && file_exists( $wgDiff3 );
$haveDiff3 = $wgDiff3 && file_exists( $wgDiff3 );
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
if ( !$haveDiff3 ) {
$this->markTestSkipped( "Skip test, since diff3 is not configured" );
if ( !$haveDiff3 ) {
$this->markTestSkipped( "Skip test, since diff3 is not configured" );