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 "Clarify documentation of minor and notminor API parameters"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
suites
/
UploadFromUrlTestSuite.php
diff --git
a/tests/phpunit/suites/UploadFromUrlTestSuite.php
b/tests/phpunit/suites/UploadFromUrlTestSuite.php
index
556c754
..
3b6d6f2
100644
(file)
--- a/
tests/phpunit/suites/UploadFromUrlTestSuite.php
+++ b/
tests/phpunit/suites/UploadFromUrlTestSuite.php
@@
-16,8
+16,7
@@
class UploadFromUrlTestSuite extends PHPUnit_Framework_TestSuite {
}
protected function setUp() {
}
protected function setUp() {
- global $wgParser, $wgParserConf, $IP, $messageMemc, $wgMemc, $wgUser,
- $wgLang, $wgOut, $wgRequest, $wgStyleDirectory,
+ global $IP, $messageMemc, $wgMemc, $wgUser, $wgLang, $wgOut, $wgRequest, $wgStyleDirectory,
$wgParserCacheType, $wgNamespaceAliases, $wgNamespaceProtection;
$tmpDir = $this->getNewTempDirectory();
$wgParserCacheType, $wgNamespaceAliases, $wgNamespaceProtection;
$tmpDir = $this->getNewTempDirectory();
@@
-58,7
+57,7
@@
class UploadFromUrlTestSuite extends PHPUnit_Framework_TestSuite {
$wgParserCacheType = CACHE_NONE;
DeferredUpdates::clearPendingUpdates();
$wgParserCacheType = CACHE_NONE;
DeferredUpdates::clearPendingUpdates();
- $wgMemc =
wfGetMainCach
e();
+ $wgMemc =
ObjectCache::getLocalClusterInstanc
e();
$messageMemc = wfGetMessageCacheStorage();
RequestContext::resetMain();
$messageMemc = wfGetMessageCacheStorage();
RequestContext::resetMain();
@@
-66,7
+65,6
@@
class UploadFromUrlTestSuite extends PHPUnit_Framework_TestSuite {
$wgUser = new User;
$wgLang = $context->getLanguage();
$wgOut = $context->getOutput();
$wgUser = new User;
$wgLang = $context->getLanguage();
$wgOut = $context->getOutput();
- $wgParser = new StubObject( 'wgParser', $wgParserConf['class'], [ $wgParserConf ] );
$wgRequest = $context->getRequest();
if ( $wgStyleDirectory === false ) {
$wgRequest = $context->getRequest();
if ( $wgStyleDirectory === false ) {