Skip to content

Commit 4bae64d

Browse files
jdforresterjdforrester
committed
Namespace includes/context
Bug: T353458 Change-Id: I4dbef138fd0110c14c70214282519189d70c94fb
1 parent 686ab56 commit 4bae64d

File tree

299 files changed

+450
-153
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

299 files changed

+450
-153
lines changed

Diff for: ‎RELEASE-NOTES-1.42

+6
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,12 @@ because of Phabricator reports.
401401
In this release of MediaWiki, XYZ classes now have a namespace and XYZ do
402402
not yet (XYZ% done, up from 63% in MediaWiki 1.41.0). The following have newly
403403
been moved:
404+
- MediaWiki\Context:
405+
- ContextSource
406+
- DerivativeContextSource
407+
- IContextSource
408+
- MutableContext
409+
- RequestContext
404410
- MediaWiki\Deferred:
405411
- AtomicSectionUpdate
406412
- AutoCommitUpdate

Diff for: ‎api.php

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

2828
use MediaWiki\Api\ApiEntryPoint;
29+
use MediaWiki\Context\RequestContext;
2930
use MediaWiki\EntryPointEnvironment;
3031
use MediaWiki\MediaWikiServices;
3132

Diff for: ‎autoload.php

+5
Original file line numberDiff line numberDiff line change
@@ -1020,6 +1020,11 @@
10201020
'MediaWiki\\Content\\Transform\\PreloadTransformParams' => __DIR__ . '/includes/content/Transform/PreloadTransformParams.php',
10211021
'MediaWiki\\Content\\Transform\\PreloadTransformParamsValue' => __DIR__ . '/includes/content/Transform/PreloadTransformParamsValue.php',
10221022
'MediaWiki\\Content\\ValidationParams' => __DIR__ . '/includes/content/ValidationParams.php',
1023+
'MediaWiki\\Context\\ContextSource' => __DIR__ . '/includes/context/ContextSource.php',
1024+
'MediaWiki\\Context\\DerivativeContext' => __DIR__ . '/includes/context/DerivativeContext.php',
1025+
'MediaWiki\\Context\\IContextSource' => __DIR__ . '/includes/context/IContextSource.php',
1026+
'MediaWiki\\Context\\MutableContext' => __DIR__ . '/includes/context/MutableContext.php',
1027+
'MediaWiki\\Context\\RequestContext' => __DIR__ . '/includes/context/RequestContext.php',
10231028
'MediaWiki\\DAO\\WikiAwareEntity' => __DIR__ . '/includes/dao/WikiAwareEntity.php',
10241029
'MediaWiki\\DAO\\WikiAwareEntityTrait' => __DIR__ . '/includes/dao/WikiAwareEntityTrait.php',
10251030
'MediaWiki\\DB\\AbstractSchemaValidationError' => __DIR__ . '/includes/db/AbstractSchemaValidationError.php',

Diff for: ‎img_auth.php

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
* @ingroup entrypoint
4040
*/
4141

42+
use MediaWiki\Context\RequestContext;
4243
use MediaWiki\HookContainer\HookRunner;
4344
use MediaWiki\Html\TemplateParser;
4445
use MediaWiki\Request\WebRequest;

Diff for: ‎includes/Category/CategoryViewer.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
namespace MediaWiki\Category;
2424

2525
use Collation;
26-
use ContextSource;
2726
use DeprecationHelper;
2827
use HtmlArmor;
29-
use IContextSource;
3028
use ILanguageConverter;
3129
use ImageGalleryBase;
3230
use ImageGalleryClassNotFoundException;
3331
use InvalidArgumentException;
3432
use LinkCache;
33+
use MediaWiki\Context\ContextSource;
34+
use MediaWiki\Context\IContextSource;
3535
use MediaWiki\HookContainer\ProtectedHookAccessorTrait;
3636
use MediaWiki\Html\Html;
3737
use MediaWiki\Linker\LinkTarget;

Diff for: ‎includes/Feed/FeedUtils.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323

2424
namespace MediaWiki\Feed;
2525

26-
use DerivativeContext;
2726
use LogFormatter;
27+
use MediaWiki\Context\DerivativeContext;
28+
use MediaWiki\Context\RequestContext;
2829
use MediaWiki\Html\Html;
2930
use MediaWiki\MainConfigNames;
3031
use MediaWiki\MediaWikiServices;
3132
use MediaWiki\Output\OutputPage;
3233
use MediaWiki\Revision\RevisionRecord;
3334
use MediaWiki\Revision\SlotRecord;
3435
use MediaWiki\Title\Title;
35-
use RequestContext;
3636
use TextContent;
3737
use UtfNormal;
3838

Diff for: ‎includes/Hook/EditFilterMergedContentHook.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace MediaWiki\Hook;
44

55
use Content;
6-
use IContextSource;
6+
use MediaWiki\Context\IContextSource;
77
use MediaWiki\Status\Status;
88
use MediaWiki\User\User;
99

Diff for: ‎includes/HookContainer/HookRunner.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
use Article;
66
use File;
7-
use IContextSource;
87
use JsonContent;
98
use MailAddress;
109
use ManualLogEntry;
10+
use MediaWiki\Context\IContextSource;
1111
use MediaWiki\Linker\LinkRenderer;
1212
use MediaWiki\Linker\LinkTarget;
1313
use MediaWiki\Mail\UserEmailContact;

Diff for: ‎includes/MediaWiki.php

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
* @file
2121
*/
2222

23+
use MediaWiki\Context\IContextSource;
24+
use MediaWiki\Context\RequestContext;
2325
use MediaWiki\EntryPointEnvironment;
2426
use MediaWiki\MediaWikiEntryPoint;
2527
use MediaWiki\MediaWikiServices;

Diff for: ‎includes/MediaWikiEntryPoint.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
use Exception;
2424
use HttpStatus;
2525
use IBufferingStatsdDataFactory;
26-
use IContextSource;
2726
use JobQueueGroup;
2827
use JobRunner;
2928
use Liuggio\StatsdClient\Sender\SocketSender;
3029
use LogicException;
3130
use MediaWiki\Block\BlockManager;
3231
use MediaWiki\Config\Config;
3332
use MediaWiki\Config\ConfigException;
33+
use MediaWiki\Context\IContextSource;
3434
use MediaWiki\Deferred\DeferredUpdates;
3535
use MediaWiki\Deferred\TransactionRoundDefiningUpdate;
3636
use MediaWiki\HookContainer\ProtectedHookAccessorTrait;

Diff for: ‎includes/Output/IframeSandbox.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
namespace MediaWiki\Output;
44

55
use DomainException;
6-
use IContextSource;
76
use MediaWiki\Config\HashConfig;
87
use MediaWiki\Config\MultiConfig;
8+
use MediaWiki\Context\IContextSource;
9+
use MediaWiki\Context\RequestContext;
910
use MediaWiki\Html\Html;
1011
use MediaWiki\MainConfigNames;
1112
use MediaWiki\Request\ContentSecurityPolicy;
@@ -14,7 +15,6 @@
1415
use MediaWiki\Specials\SpecialIframeError;
1516
use MediaWiki\Title\TitleFactory;
1617
use MediaWiki\User\UserFactory;
17-
use RequestContext;
1818
use SkinFactory;
1919
use Wikimedia\Assert\Assert;
2020

Diff for: ‎includes/Output/IframeSandboxFactory.php

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

33
namespace MediaWiki\Output;
44

5+
use MediaWiki\Context\RequestContext;
56
use MediaWiki\Title\TitleFactory;
67
use MediaWiki\User\UserFactory;
7-
use RequestContext;
88
use SkinFactory;
99

1010
/**

Diff for: ‎includes/Output/OutputPage.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,20 @@
2424

2525
use Article;
2626
use Content;
27-
use ContextSource;
2827
use CSSJanus;
2928
use Exception;
3029
use ExtensionRegistry;
3130
use File;
3231
use HtmlArmor;
33-
use IContextSource;
3432
use InvalidArgumentException;
3533
use JavaScriptContent;
3634
use Language;
3735
use LanguageCode;
3836
use LinkCache;
3937
use MediaWiki\Config\Config;
38+
use MediaWiki\Context\ContextSource;
39+
use MediaWiki\Context\IContextSource;
40+
use MediaWiki\Context\RequestContext;
4041
use MediaWiki\HookContainer\ProtectedHookAccessorTrait;
4142
use MediaWiki\Html\Html;
4243
use MediaWiki\Linker\LinkTarget;
@@ -64,7 +65,6 @@
6465
use OOUI\Theme;
6566
use Parser;
6667
use ParserOptions;
67-
use RequestContext;
6868
use RuntimeException;
6969
use Skin;
7070
use TextContent;

Diff for: ‎includes/OutputTransform/Stages/HandleSectionLinks.php

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

33
namespace MediaWiki\OutputTransform\Stages;
44

5+
use MediaWiki\Context\RequestContext;
56
use MediaWiki\OutputTransform\ContentTextTransformStage;
67
use MediaWiki\Parser\ParserOutput;
78
use MediaWiki\Parser\Sanitizer;
89
use MediaWiki\Title\Title;
910
use MediaWiki\Title\TitleFactory;
1011
use ParserOptions;
1112
use Psr\Log\LoggerInterface;
12-
use RequestContext;
1313
use Skin;
1414

1515
/**

Diff for: ‎includes/OutputTransform/Stages/HandleTOCMarkers.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
namespace MediaWiki\OutputTransform\Stages;
44

55
use Language;
6+
use MediaWiki\Context\RequestContext;
67
use MediaWiki\Linker\Linker;
78
use MediaWiki\OutputTransform\ContentTextTransformStage;
89
use MediaWiki\Parser\ParserOutput;
910
use MediaWiki\Parser\Sanitizer;
1011
use MediaWiki\Tidy\TidyDriverBase;
1112
use Parser;
1213
use ParserOptions;
13-
use RequestContext;
1414

1515
/**
1616
* Inject table of contents (or empty string if there's no sections)

Diff for: ‎includes/Permissions/PermissionManager.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
*/
2020
namespace MediaWiki\Permissions;
2121

22-
use IContextSource;
2322
use InvalidArgumentException;
2423
use LogicException;
2524
use MediaWiki\Actions\ActionFactory;
@@ -28,6 +27,8 @@
2827
use MediaWiki\Block\BlockErrorFormatter;
2928
use MediaWiki\Block\BlockManager;
3029
use MediaWiki\Config\ServiceOptions;
30+
use MediaWiki\Context\IContextSource;
31+
use MediaWiki\Context\RequestContext;
3132
use MediaWiki\HookContainer\HookContainer;
3233
use MediaWiki\HookContainer\HookRunner;
3334
use MediaWiki\Linker\LinkTarget;
@@ -51,7 +52,6 @@
5152
use Message;
5253
use MessageSpecifier;
5354
use PermissionsError;
54-
use RequestContext;
5555
use StatusValue;
5656
use UserCache;
5757
use Wikimedia\ScopedCallback;

Diff for: ‎includes/Permissions/UserAuthority.php

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

2121
namespace MediaWiki\Permissions;
2222

23-
use IContextSource;
2423
use IDBAccessObject;
2524
use InvalidArgumentException;
2625
use MediaWiki\Block\Block;
2726
use MediaWiki\Block\BlockErrorFormatter;
27+
use MediaWiki\Context\IContextSource;
2828
use MediaWiki\Linker\LinkTarget;
2929
use MediaWiki\Page\PageIdentity;
3030
use MediaWiki\Request\WebRequest;

Diff for: ‎includes/Rest/EntryPoint.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
namespace MediaWiki\Rest;
44

55
use ExtensionRegistry;
6-
use IContextSource;
76
use MediaWiki;
87
use MediaWiki\Config\Config;
98
use MediaWiki\Config\ServiceOptions;
9+
use MediaWiki\Context\IContextSource;
10+
use MediaWiki\Context\RequestContext;
1011
use MediaWiki\MainConfigNames;
1112
use MediaWiki\MediaWikiServices;
1213
use MediaWiki\Request\WebResponse;
@@ -16,7 +17,6 @@
1617
use MediaWiki\Rest\Validator\Validator;
1718
use MediaWiki\Title\Title;
1819
use MWExceptionRenderer;
19-
use RequestContext;
2020
use Wikimedia\Message\ITextFormatter;
2121

2222
class EntryPoint {

Diff for: ‎includes/Rest/Handler/ActionModuleBasedHandler.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
use ApiMessage;
88
use ApiUsageException;
99
use IApiMessage;
10+
use MediaWiki\Context\RequestContext;
1011
use MediaWiki\Request\FauxRequest;
1112
use MediaWiki\Request\WebResponse;
1213
use MediaWiki\Rest\Handler;
1314
use MediaWiki\Rest\HttpException;
1415
use MediaWiki\Rest\LocalizedHttpException;
1516
use MediaWiki\Rest\Response;
16-
use RequestContext;
1717
use Wikimedia\Message\ListParam;
1818
use Wikimedia\Message\MessageParam;
1919
use Wikimedia\Message\MessageValue;

Diff for: ‎includes/Rest/Handler/ParsoidHandler.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
use LanguageCode;
2626
use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
2727
use LogicException;
28+
use MediaWiki\Context\RequestContext;
2829
use MediaWiki\Logger\LoggerFactory;
2930
use MediaWiki\MainConfigNames;
3031
use MediaWiki\MediaWikiServices;
@@ -46,7 +47,6 @@
4647
use MediaWiki\Title\Title;
4748
use MediaWiki\WikiMap\WikiMap;
4849
use MobileContext;
49-
use RequestContext;
5050
use Wikimedia\Http\HttpAcceptParser;
5151
use Wikimedia\Message\DataMessageValue;
5252
use Wikimedia\Parsoid\Config\DataAccess;
@@ -139,7 +139,7 @@ protected function assertDomainIsCorrect( $domain ): void {
139139
// We are cutting some corners here (IDN, non-ASCII casing)
140140
// since domain name support is provisional.
141141
// TODO use a proper validator instead
142-
$server = \RequestContext::getMain()->getConfig()->get( MainConfigNames::Server );
142+
$server = RequestContext::getMain()->getConfig()->get( MainConfigNames::Server );
143143
$services = MediaWikiServices::getInstance();
144144
$expectedDomain = $services->getUrlUtils()->parse( $server )['host'] ?? null;
145145
if ( !$expectedDomain ) {

Diff for: ‎includes/Rest/Handler/SearchHandler.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use ISearchResultSet;
77
use MediaWiki\Cache\CacheKeyHelper;
88
use MediaWiki\Config\Config;
9+
use MediaWiki\Context\RequestContext;
910
use MediaWiki\Language\FormatterFactory;
1011
use MediaWiki\MainConfigNames;
1112
use MediaWiki\Page\PageIdentity;
@@ -18,7 +19,6 @@
1819
use MediaWiki\Search\Entity\SearchResultThumbnail;
1920
use MediaWiki\Search\SearchResultThumbnailProvider;
2021
use MediaWiki\Title\TitleFormatter;
21-
use RequestContext;
2222
use SearchEngine;
2323
use SearchEngineConfig;
2424
use SearchEngineFactory;

Diff for: ‎includes/Revision/ContributionsLookup.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
namespace MediaWiki\Revision;
44

55
use ChangeTags;
6-
use IContextSource;
76
use MediaWiki\Cache\LinkBatchFactory;
87
use MediaWiki\CommentFormatter\CommentFormatter;
8+
use MediaWiki\Context\IContextSource;
9+
use MediaWiki\Context\RequestContext;
910
use MediaWiki\HookContainer\HookContainer;
1011
use MediaWiki\Linker\LinkRendererFactory;
1112
use MediaWiki\Pager\ContribsPager;
@@ -14,7 +15,6 @@
1415
use MediaWiki\Title\NamespaceInfo;
1516
use MediaWiki\User\UserIdentity;
1617
use Message;
17-
use RequestContext;
1818
use Wikimedia\Rdbms\IConnectionProvider;
1919

2020
/**

Diff for: ‎includes/ServiceWiring.php

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
use MediaWiki\Content\IContentHandlerFactory;
8080
use MediaWiki\Content\Renderer\ContentRenderer;
8181
use MediaWiki\Content\Transform\ContentTransformer;
82+
use MediaWiki\Context\RequestContext;
8283
use MediaWiki\DAO\WikiAwareEntity;
8384
use MediaWiki\Deferred\DeferredUpdates;
8485
use MediaWiki\Edit\ParsoidOutputStash;

Diff for: ‎includes/Setup.php

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252

5353
// phpcs:disable MediaWiki.Usage.DeprecatedGlobalVariables
5454
use MediaWiki\Config\SiteConfiguration;
55+
use MediaWiki\Context\RequestContext;
5556
use MediaWiki\Deferred\DeferredUpdates;
5657
use MediaWiki\HookContainer\FauxGlobalHookArray;
5758
use MediaWiki\HookContainer\HookRunner;

Diff for: ‎includes/Status/Status.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222

2323
namespace MediaWiki\Status;
2424

25-
use IContextSource;
2625
use Language;
26+
use MediaWiki\Context\IContextSource;
27+
use MediaWiki\Context\RequestContext;
2728
use MediaWiki\MediaWikiServices;
2829
use MediaWiki\StubObject\StubUserLang;
2930
use Message;
3031
use MessageLocalizer;
31-
use RequestContext;
3232
use RuntimeException;
3333
use StatusValue;
3434

Diff for: ‎includes/StubObject/StubUserLang.php

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

2323
use Language;
24-
use RequestContext;
24+
use MediaWiki\Context\RequestContext;
2525

2626
/**
2727
* Stub object for the user language. Assigned to the $wgLang global.

0 commit comments

Comments
 (0)