Use new ResourceLoader namespace

Extensions using Phan need to be updated simultaneously with core due
to T308443.

Bug: T308718
Depends-On: Id08a220e1d6085e2b33f3f6c9d0e3935a4204659
Change-Id: I08d1a4122d1c8052d1cdfc6f8249abdaa80067a7
This commit is contained in:
Tim Starling 2022-05-20 12:11:31 +10:00
parent ef06fb78aa
commit 60e2f04942
2 changed files with 8 additions and 6 deletions

View file

@ -34,6 +34,8 @@ use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MediaWikiServices;
use MediaWiki\Preferences\MultiTitleFilter;
use MediaWiki\Preferences\MultiUsernameFilter;
use MediaWiki\ResourceLoader as RL;
use MediaWiki\ResourceLoader\ResourceLoader;
use MediaWiki\Revision\RevisionRecord;
use MediaWiki\Storage\EditResult;
use MediaWiki\User\UserIdentity;
@ -42,8 +44,6 @@ use MWEchoNotifUser;
use MWException;
use OutputPage;
use RecentChange;
use ResourceLoader;
use ResourceLoaderContext;
use ResourceLoaderEchoImageModule;
use Skin;
use SkinTemplate;
@ -1604,14 +1604,14 @@ class Hooks implements RecentChange_saveHook {
$messages[] = 'echo-notification-loginrequired';
}
public static function getConfigVars( ResourceLoaderContext $context, Config $config ) {
public static function getConfigVars( RL\Context $context, Config $config ) {
return [
'EchoMaxNotificationCount' => MWEchoNotifUser::MAX_BADGE_COUNT,
'EchoPollForUpdates' => $config->get( 'EchoPollForUpdates' )
];
}
public static function getLoggerConfigVars( ResourceLoaderContext $context, Config $config ) {
public static function getLoggerConfigVars( RL\Context $context, Config $config ) {
$schemas = $config->get( 'EchoEventLoggingSchemas' );
return [
'EchoInteractionLogging' => $schemas['EchoInteraction']['enabled'] &&

View file

@ -18,11 +18,13 @@
* @file
*/
use MediaWiki\ResourceLoader as RL;
/**
* A sibling of secret special sauce.
* @see ResourceLoaderOOUIImageModule for familial resemblence
* @see RL\OOUIImageModule for familial resemblence
*/
class ResourceLoaderEchoImageModule extends ResourceLoaderImageModule {
class ResourceLoaderEchoImageModule extends RL\ImageModule {
protected function loadFromDefinition() {
if ( $this->definition === null ) {
return;