Skip to content

Commit 9879723

Browse files
committed
Use namespaced classes (1)
Changes to the use statements done automatically via script Addition of missing use statement done manually Change-Id: Ic4d4dd61de5ab896fb6173eb579c81f164a1e4a3
1 parent 7650245 commit 9879723

35 files changed

+37
-12
lines changed

Diff for: includes/GlobalFunctions.php

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
use MediaWiki\Libs\UnpackFailedException;
2626
use MediaWiki\Logger\LoggerFactory;
2727
use MediaWiki\MediaWikiServices;
28+
use MediaWiki\Message\Message;
2829
use MediaWiki\ProcOpenError;
2930
use MediaWiki\Request\WebRequest;
3031
use MediaWiki\Shell\Shell;

Diff for: includes/MediaWikiServices.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,11 @@
169169
use MediaWiki\User\BotPasswordStore;
170170
use MediaWiki\User\CentralId\CentralIdLookup;
171171
use MediaWiki\User\CentralId\CentralIdLookupFactory;
172+
use MediaWiki\User\Options\StaticUserOptionsLookup;
172173
use MediaWiki\User\Options\UserOptionsLookup;
173174
use MediaWiki\User\Options\UserOptionsManager;
174175
use MediaWiki\User\PasswordReset;
175176
use MediaWiki\User\Registration\UserRegistrationLookup;
176-
use MediaWiki\User\StaticUserOptionsLookup;
177177
use MediaWiki\User\TalkPageNotificationManager;
178178
use MediaWiki\User\TempUser\RealTempUserConfig;
179179
use MediaWiki\User\TempUser\TempUserCreator;

Diff for: includes/ServiceWiring.php

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@
127127
use MediaWiki\Mail\IEmailer;
128128
use MediaWiki\MainConfigNames;
129129
use MediaWiki\MediaWikiServices;
130+
use MediaWiki\Message\Message;
130131
use MediaWiki\Message\MessageFormatterFactory;
131132
use MediaWiki\OutputTransform\DefaultOutputPipelineFactory;
132133
use MediaWiki\OutputTransform\OutputTransformPipeline;

Diff for: includes/Setup.php

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
use MediaWiki\MainConfigNames;
6262
use MediaWiki\MainConfigSchema;
6363
use MediaWiki\MediaWikiServices;
64+
use MediaWiki\Message\Message;
6465
use MediaWiki\Request\HeaderCallback;
6566
use MediaWiki\Settings\DynamicDefaultValues;
6667
use MediaWiki\Settings\LocalSettingsLoader;

Diff for: includes/cache/BacklinkCacheFactory.php

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
namespace MediaWiki\Cache;
2525

26-
use BacklinkCache;
2726
use MediaWiki\Config\ServiceOptions;
2827
use MediaWiki\HookContainer\HookContainer;
2928
use MediaWiki\Linker\LinksMigration;

Diff for: includes/cache/HTMLFileCache.php

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
*/
2323

2424
use MediaWiki\Cache\CacheKeyHelper;
25+
use MediaWiki\Cache\FileCacheBase;
2526
use MediaWiki\Context\IContextSource;
2627
use MediaWiki\HookContainer\HookRunner;
2728
use MediaWiki\MainConfigNames;

Diff for: includes/cache/LinkBatchFactory.php

-3
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@
2323

2424
namespace MediaWiki\Cache;
2525

26-
use GenderCache;
2726
use Language;
28-
use LinkBatch;
29-
use LinkCache;
3027
use MediaWiki\Linker\LinksMigration;
3128
use MediaWiki\Linker\LinkTarget;
3229
use MediaWiki\Page\PageReference;

Diff for: includes/changetags/ChangeTags.php

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
use MediaWiki\Language\RawMessage;
2929
use MediaWiki\MainConfigNames;
3030
use MediaWiki\MediaWikiServices;
31+
use MediaWiki\Message\Message;
3132
use MediaWiki\Parser\Sanitizer;
3233
use MediaWiki\Permissions\Authority;
3334
use MediaWiki\Permissions\PermissionStatus;

Diff for: includes/content/ContentModelChange.php

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use MediaWiki\Context\RequestContext;
77
use MediaWiki\HookContainer\HookContainer;
88
use MediaWiki\HookContainer\HookRunner;
9+
use MediaWiki\Message\Message;
910
use MediaWiki\Page\PageIdentity;
1011
use MediaWiki\Permissions\Authority;
1112
use MediaWiki\Permissions\PermissionStatus;

Diff for: includes/content/MessageContent.php

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
* @author Daniel Kinzler
2727
*/
2828

29+
use MediaWiki\Message\Message;
30+
2931
/**
3032
* Wrapper allowing us to handle a system message as a Content object.
3133
* Note that this is generally *not* used to represent content from the

Diff for: includes/debug/MW.php

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
use MediaWiki\MediaWikiServices;
44
use MediaWiki\Revision\RevisionRecord;
5+
use MediaWiki\Title\Title;
56
use MediaWiki\User\User;
67

78
/**

Diff for: includes/diff/DifferenceEngine.php

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
use MediaWiki\Linker\LinkRenderer;
3434
use MediaWiki\MainConfigNames;
3535
use MediaWiki\MediaWikiServices;
36+
use MediaWiki\Message\Message;
3637
use MediaWiki\Page\ParserOutputAccess;
3738
use MediaWiki\Page\WikiPageFactory;
3839
use MediaWiki\Permissions\Authority;

Diff for: includes/diff/DifferenceEngineSlotDiffRenderer.php

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* @file
2121
* @ingroup DifferenceEngine
2222
*/
23+
use MediaWiki\Context\DerivativeContext;
2324
use MediaWiki\MediaWikiServices;
2425
use MediaWiki\Output\OutputPage;
2526

Diff for: includes/filerepo/ThumbnailEntryPoint.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
use MediaWiki\MainConfigNames;
4141
use MediaWiki\MediaWikiEntryPoint;
4242
use MediaWiki\MediaWikiServices;
43+
use MediaWiki\Message\Message;
4344
use MediaWiki\Permissions\PermissionStatus;
4445
use MediaWiki\PoolCounter\PoolCounterWorkViaCallback;
4546
use MediaWiki\Profiler\ProfilingContext;
4647
use MediaWiki\Request\HeaderCallback;
4748
use MediaWiki\Status\Status;
4849
use MediaWiki\Title\Title;
49-
use Message;
5050
use MessageSpecifier;
5151
use RepoGroup;
5252
use UnregisteredLocalFile;

Diff for: includes/installer/ConnectionStatus.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace MediaWiki\Installer;
44

5-
use Status;
5+
use MediaWiki\Status\Status;
66
use Wikimedia\Rdbms\Database;
77

88
/**

Diff for: includes/installer/Installer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
use MediaWiki\Status\Status;
5656
use MediaWiki\StubObject\StubGlobalUser;
5757
use MediaWiki\Title\Title;
58-
use MediaWiki\User\StaticUserOptionsLookup;
58+
use MediaWiki\User\Options\StaticUserOptionsLookup;
5959
use MediaWiki\User\User;
6060
use MediaWiki\Utils\UrlUtils;
6161
use MessageSpecifier;

Diff for: includes/language/Language.php

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
use MediaWiki\Logger\LoggerFactory;
4444
use MediaWiki\MainConfigNames;
4545
use MediaWiki\MediaWikiServices;
46+
use MediaWiki\Message\Message;
4647
use MediaWiki\Parser\MagicWord;
4748
use MediaWiki\Title\NamespaceInfo;
4849
use MediaWiki\User\User;

Diff for: includes/language/LocalisationCache.php

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
use CLDRPluralRuleParser\Error as CLDRPluralRuleError;
2222
use CLDRPluralRuleParser\Evaluator;
23+
use MediaWiki\Config\ConfigException;
2324
use MediaWiki\Config\ServiceOptions;
2425
use MediaWiki\HookContainer\HookContainer;
2526
use MediaWiki\HookContainer\HookRunner;

Diff for: includes/language/MessageLocalizer.php

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
* @file
1919
*/
2020

21+
use MediaWiki\Message\Message;
22+
2123
/**
2224
* Interface for localizing messages in MediaWiki
2325
*

Diff for: includes/objectcache/ObjectCacheFactory.php

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
*/
2020

2121
use MediaWiki\Config\ServiceOptions;
22+
use MediaWiki\Deferred\DeferredUpdates;
2223
use MediaWiki\Http\Telemetry;
2324
use MediaWiki\Logger\Spi;
2425
use MediaWiki\MainConfigNames;

Diff for: includes/session/SessionProvider.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
use MediaWiki\HookContainer\HookContainer;
3333
use MediaWiki\HookContainer\HookRunner;
3434
use MediaWiki\MainConfigNames;
35+
use MediaWiki\Message\Message;
3536
use MediaWiki\Request\WebRequest;
3637
use MediaWiki\User\User;
3738
use MediaWiki\User\UserNameUtils;
@@ -625,7 +626,7 @@ public function __toString() {
625626
* @warning This will be called early during MediaWiki startup. Do not
626627
* use $wgUser, $wgLang, $wgOut, the global Parser, or their equivalents via
627628
* RequestContext from this method!
628-
* @return \Message
629+
* @return Message
629630
*/
630631
protected function describeMessage() {
631632
return wfMessage(

Diff for: includes/skins/BaseTemplate.php

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
*/
2020

2121
use MediaWiki\Html\Html;
22+
use MediaWiki\Message\Message;
2223
use MediaWiki\Parser\Sanitizer;
2324

2425
/**

Diff for: includes/skins/SkinTemplate.php

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
use MediaWiki\Linker\Linker;
2626
use MediaWiki\MainConfigNames;
2727
use MediaWiki\MediaWikiServices;
28+
use MediaWiki\Message\Message;
2829
use MediaWiki\Permissions\Authority;
2930
use MediaWiki\ResourceLoader as RL;
3031
use MediaWiki\Skin\SkinComponentUtils;

Diff for: includes/user/BotPassword.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
namespace MediaWiki\User;
2222

2323
use IDBAccessObject;
24-
use InvalidPassword;
2524
use MediaWiki\Auth\AuthenticationResponse;
2625
use MediaWiki\Auth\Throttler;
2726
use MediaWiki\Config\Config;
2827
use MediaWiki\HookContainer\HookRunner;
2928
use MediaWiki\Json\FormatJson;
3029
use MediaWiki\MainConfigNames;
3130
use MediaWiki\MediaWikiServices;
31+
use MediaWiki\Password\InvalidPassword;
3232
use MediaWiki\Password\Password;
3333
use MediaWiki\Password\PasswordError;
3434
use MediaWiki\Password\PasswordFactory;

Diff for: includes/utils/MWRestrictions.php

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use MediaWiki\Linker\LinkTarget;
2323
use MediaWiki\Request\WebRequest;
2424
use MediaWiki\Status\Status;
25+
use MediaWiki\Title\Title;
2526
use Wikimedia\IPSet;
2627
use Wikimedia\IPUtils;
2728

Diff for: includes/xml/Xml.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
use MediaWiki\Languages\LanguageNameUtils;
2727
use MediaWiki\MainConfigNames;
2828
use MediaWiki\MediaWikiServices;
29+
use MediaWiki\Message\Message;
2930
use MediaWiki\Parser\Sanitizer;
3031
use MediaWiki\Utils\MWTimestamp;
31-
use Message;
3232
use UtfNormal\Validator;
3333

3434
/**

Diff for: maintenance/cleanupPreferences.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
require_once __DIR__ . '/Maintenance.php';
2828

2929
use MediaWiki\MainConfigNames;
30-
use MediaWiki\User\UserOptionsLookup;
30+
use MediaWiki\User\Options\UserOptionsLookup;
3131
use Wikimedia\Rdbms\IExpression;
3232
use Wikimedia\Rdbms\LikeValue;
3333

Diff for: maintenance/dumpIterator.php

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
use MediaWiki\Revision\SlotRecord;
3232
use MediaWiki\Settings\SettingsBuilder;
3333
use MediaWiki\Title\Title;
34+
use MediaWiki\User\User;
3435

3536
require_once __DIR__ . '/Maintenance.php';
3637

Diff for: maintenance/importDump.php

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
use MediaWiki\Linker\LinkTarget;
2828
use MediaWiki\Permissions\UltimateAuthority;
29+
use MediaWiki\User\User;
2930

3031
require_once __DIR__ . '/Maintenance.php';
3132

Diff for: maintenance/includes/DeleteLocalPasswords.php

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
* @ingroup Maintenance
2222
*/
2323

24+
use MediaWiki\Password\InvalidPassword;
2425
use MediaWiki\Password\PasswordFactory;
2526
use Wikimedia\Rdbms\IDatabase;
2627
use Wikimedia\Rdbms\IExpression;

Diff for: maintenance/storage/checkStorage.php

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
use MediaWiki\Permissions\UltimateAuthority;
2525
use MediaWiki\Shell\Shell;
26+
use MediaWiki\User\User;
2627

2728
require_once __DIR__ . '/../Maintenance.php';
2829

Diff for: maintenance/wrapOldPasswords.php

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
* @ingroup Maintenance
2222
*/
2323

24+
use MediaWiki\Password\LayeredParameterizedPassword;
25+
use MediaWiki\Password\ParameterizedPassword;
2426
use MediaWiki\User\User;
2527
use Wikimedia\Rdbms\IExpression;
2628
use Wikimedia\Rdbms\LikeValue;

Diff for: rest.php

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
* @file
2222
*/
2323

24+
use MediaWiki\Context\RequestContext;
2425
use MediaWiki\EntryPointEnvironment;
2526
use MediaWiki\MediaWikiServices;
2627
use MediaWiki\Rest\EntryPoint;

Diff for: thumb.php

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
* @ingroup Media
2525
*/
2626

27+
use MediaWiki\Context\RequestContext;
2728
use MediaWiki\EntryPointEnvironment;
2829
use MediaWiki\FileRepo\ThumbnailEntryPoint;
2930
use MediaWiki\MediaWikiServices;

Diff for: thumb_handler.php

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
* @ingroup Media
3131
*/
3232

33+
use MediaWiki\Context\RequestContext;
3334
use MediaWiki\EntryPointEnvironment;
3435
use MediaWiki\FileRepo\Thumbnail404EntryPoint;
3536
use MediaWiki\MediaWikiServices;

0 commit comments

Comments
 (0)