w/s changes

[lhc/web/wiklou.git] / maintenance / tests / UploadFromUrlTestSuite.php

diff --git a/maintenance/tests/UploadFromUrlTestSuite.php b/maintenance/tests/UploadFromUrlTestSuite.php
index 2de8eba..8393eb7 100644 (file)
--- a/maintenance/tests/UploadFromUrlTestSuite.php
+++ b/maintenance/tests/UploadFromUrlTestSuite.php
@@ -13,11 +13,11 @@ class UploadFromUrlTestSuite extends PHPUnit_Framework_TestSuite
 
        function setUp() {
                global $wgParser,  $wgParserConf, $IP, $messageMemc, $wgMemc, $wgDeferredUpdateList,
-                  $wgUser, $wgLang, $wgOut, $wgRequest, $wgStyleDirectory, $wgEnableParserCache,
-                  $wgMessageCache, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $parserMemc,
-                  $wgNamespaceAliases, $wgNamespaceProtection, $wgLocalFileRepo,
-                  $wgNamespacesWithSubpages, $wgThumbnailScriptPath, $wgScriptPath,
-                  $wgArticlePath, $wgStyleSheetPath, $wgScript, $wgStylePath;
+                                 $wgUser, $wgLang, $wgOut, $wgRequest, $wgStyleDirectory, $wgEnableParserCache,
+                                 $wgMessageCache, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $parserMemc,
+                                 $wgNamespaceAliases, $wgNamespaceProtection, $wgLocalFileRepo,
+                                 $wgThumbnailScriptPath, $wgScriptPath,
+                                 $wgArticlePath, $wgStyleSheetPath, $wgScript, $wgStylePath;
 
                $wgScript = '/index.php';
                $wgScriptPath = '/';
@@ -45,8 +45,8 @@ class UploadFromUrlTestSuite extends PHPUnit_Framework_TestSuite
                $messageMemc =& wfGetMessageCacheStorage();
                $parserMemc =& wfGetParserCacheStorage();
 
-               $wgContLang = new StubContLang;
-               $wgUser = new StubUser;
+               //$wgContLang = new StubContLang;
+               $wgUser = new User;
                $wgLang = new StubUserLang;
                $wgOut = new StubObject( 'wgOut', 'OutputPage' );
                $wgParser = new StubObject( 'wgParser', $wgParserConf['class'], array( $wgParserConf ) );
@@ -54,7 +54,7 @@ class UploadFromUrlTestSuite extends PHPUnit_Framework_TestSuite
 
                $wgMessageCache = new StubObject( 'wgMessageCache', 'MessageCache',
                                                                                  array( $messageMemc, $wgUseDatabaseMessages,
-                                                                                                $wgMsgCacheExpiry, wfWikiID() ) );
+                                                                                                $wgMsgCacheExpiry ) );
                if ( $wgStyleDirectory === false ) $wgStyleDirectory   = "$IP/skins";
 
        }
@@ -163,10 +163,10 @@ class UploadFromUrlTestSuite extends PHPUnit_Framework_TestSuite
                return $dir;
        }
 
-    public static function suite()
-    {
-        return new UploadFromUrlTestSuite( 'UploadFromUrlTest' );
-    }
+       public static function suite()
+       {
+               return new UploadFromUrlTestSuite( 'UploadFromUrlTest' );
+       }
 
 }