Use namespaced classes

Changes to the use statements done automatically via script

Change-Id: Iab065a2005acccfe05cc827fdafc7861687d053d

includes/Api/ApiEchoArticleReminder.php

@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Extension\Notifications\Api;
 
-use ApiBase;
 use DateInterval;
 use DateTime;
+use MediaWiki\Api\ApiBase;
 use MediaWiki\Extension\Notifications\Model\Event;
 use MediaWiki\Utils\MWTimestamp;
 use Wikimedia\ParamValidator\ParamValidator;

includes/Api/ApiEchoCreateEvent.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\Notifications\Api;
 
-use ApiBase;
-use ApiMain;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiMain;
 use MediaWiki\Extension\Notifications\Model\Event;
 use MediaWiki\ParamValidator\TypeDef\TitleDef;
 use MediaWiki\ParamValidator\TypeDef\UserDef;

includes/Api/ApiEchoMarkRead.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Extension\Notifications\Api;
 
-use ApiBase;
+use MediaWiki\Api\ApiBase;
 use MediaWiki\Extension\Notifications\AttributeManager;
 use MediaWiki\Extension\Notifications\Controller\NotificationController;
 use MediaWiki\Extension\Notifications\DbFactory;

includes/Api/ApiEchoMarkSeen.php

@@ -4,7 +4,7 @@ namespace MediaWiki\Extension\Notifications\Api;
 
 // This is a GET module, not a POST module, for multi-DC support. See T222851.
 // Note that this module doesn't write to the database, only to the seentime cache.
-use ApiBase;
+use MediaWiki\Api\ApiBase;
 use MediaWiki\Extension\Notifications\SeenTime;
 use Wikimedia\ParamValidator\ParamValidator;
 

includes/Api/ApiEchoMute.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\Notifications\Api;
 
-use ApiBase;
-use ApiMain;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiMain;
 use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\Title\Title;
 use MediaWiki\User\CentralId\CentralIdLookup;

includes/Api/ApiEchoNotifications.php

@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Extension\Notifications\Api;
 
-use ApiBase;
-use ApiQuery;
-use ApiQueryBase;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiQuery;
+use MediaWiki\Api\ApiQueryBase;
 use MediaWiki\Config\Config;
 use MediaWiki\Extension\Notifications\AttributeManager;
 use MediaWiki\Extension\Notifications\Bundler;

includes/Api/ApiEchoUnreadNotificationPages.php

@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Extension\Notifications\Api;
 
-use ApiQuery;
-use ApiQueryBase;
-use ApiUsageException;
+use MediaWiki\Api\ApiQuery;
+use MediaWiki\Api\ApiQueryBase;
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\Extension\Notifications\DbFactory;
 use MediaWiki\Extension\Notifications\NotifUser;
 use MediaWiki\Extension\Notifications\Services;

includes/CachedList.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Extension\Notifications;
 
 use UnexpectedValueException;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 
 /**
  * Caches an ContainmentList within WANObjectCache to prevent needing

includes/ContainmentSet.php

@@ -6,7 +6,7 @@ use BadMethodCallException;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Preferences\MultiUsernameFilter;
 use MediaWiki\User\User;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 
 /**
  * Utilizes ContainmentList interface to provide a fluent interface to whitelist/blacklist

includes/Controller/NotificationController.php

@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Extension\Notifications\Controller;
 
-use IDBAccessObject;
 use InvalidArgumentException;
 use Iterator;
 use MapCacheLRU;
@@ -24,6 +23,7 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
 use MediaWiki\User\UserIdentity;
+use Wikimedia\Rdbms\IDBAccessObject;
 
 /**
  * This class represents the controller for notifications

includes/DataOutputFormatter.php

@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Extension\Notifications;
 
-use Language;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Extension\Notifications\Formatters\EchoEventFormatter;
 use MediaWiki\Extension\Notifications\Formatters\EchoFlyoutFormatter;
@@ -10,6 +9,7 @@ use MediaWiki\Extension\Notifications\Formatters\EchoModelFormatter;
 use MediaWiki\Extension\Notifications\Formatters\SpecialNotificationsFormatter;
 use MediaWiki\Extension\Notifications\Model\Event;
 use MediaWiki\Extension\Notifications\Model\Notification;
+use MediaWiki\Language\Language;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\User\User;
 use MediaWiki\User\UserIdentity;

includes/DiscussionParser.php

@@ -3,12 +3,13 @@
 namespace MediaWiki\Extension\Notifications;
 
 use Article;
-use IDBAccessObject;
-use Language;
+use MediaWiki\Content\TextContent;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Extension\Notifications\Hooks\HookRunner;
 use MediaWiki\Extension\Notifications\Model\Event;
+use MediaWiki\Language\Language;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Parser\ParserOptions;
 use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\Sanitizer;
 use MediaWiki\Revision\RevisionRecord;
@@ -16,9 +17,8 @@ use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
 use MediaWiki\User\UserNameUtils;
-use ParserOptions;
 use RuntimeException;
-use TextContent;
+use Wikimedia\Rdbms\IDBAccessObject;
 
 abstract class DiscussionParser {
 	private const HEADER_REGEX = '^(==+)\h*([^=].*)\h*\1$';

includes/EmailBatch.php

@@ -3,12 +3,12 @@
 namespace MediaWiki\Extension\Notifications;
 
 use BatchRowIterator;
-use Language;
 use MailAddress;
 use MediaWiki\Extension\Notifications\Formatters\EchoHtmlDigestEmailFormatter;
 use MediaWiki\Extension\Notifications\Formatters\EchoPlainTextDigestEmailFormatter;
 use MediaWiki\Extension\Notifications\Mapper\EventMapper;
 use MediaWiki\Extension\Notifications\Model\Event;
+use MediaWiki\Language\Language;
 use MediaWiki\Languages\LanguageFactory;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\User\Options\UserOptionsManager;

includes/ForeignWikiRequest.php

@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Extension\Notifications;
 
-use ApiMain;
 use CentralAuthSessionProvider;
 use Exception;
+use MediaWiki\Api\ApiMain;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;

includes/Formatters/EchoEditUserTalkPresentationModel.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\Notifications\Formatters;
 
-use Language;
 use MediaWiki\Extension\Notifications\Model\Event;
+use MediaWiki\Language\Language;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\User\User;
 

includes/Formatters/EchoEventDigestFormatter.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\Notifications\Formatters;
 
-use Language;
 use MediaWiki\Extension\Notifications\Model\Event;
+use MediaWiki\Language\Language;
 use MediaWiki\Message\Message;
 use MediaWiki\User\User;
 

includes/Formatters/EchoEventFormatter.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\Notifications\Formatters;
 
-use Language;
 use MediaWiki\Extension\Notifications\Model\Event;
+use MediaWiki\Language\Language;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\Message\Message;
 use MediaWiki\User\User;

includes/Formatters/EchoEventPresentationModel.php

@@ -4,9 +4,9 @@ namespace MediaWiki\Extension\Notifications\Formatters;
 
 use InvalidArgumentException;
 use JsonSerializable;
-use Language;
 use MediaWiki\Extension\Notifications\Controller\NotificationController;
 use MediaWiki\Extension\Notifications\Model\Event;
+use MediaWiki\Language\Language;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Message\Message;
 use MediaWiki\Revision\RevisionRecord;

includes/Formatters/EchoHtmlDigestEmailFormatter.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\Notifications\Formatters;
 
-use Language;
 use MediaWiki\Html\Html;
+use MediaWiki\Language\Language;
 use MediaWiki\Parser\Sanitizer;
 use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\User\User;

includes/Formatters/EchoHtmlEmailFormatter.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\Notifications\Formatters;
 
-use Language;
 use MediaWiki\Html\Html;
+use MediaWiki\Language\Language;
 use MediaWiki\Parser\Sanitizer;
 use MediaWiki\SpecialPage\SpecialPage;
 

includes/Formatters/EchoMentionPresentationModel.php

@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Extension\Notifications\Formatters;
 
-use Language;
 use MediaWiki\Extension\Notifications\DiscussionParser;
 use MediaWiki\Extension\Notifications\Model\Event;
+use MediaWiki\Language\Language;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\User\User;
 

includes/Formatters/EchoMentionStatusPresentationModel.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\Notifications\Formatters;
 
-use Language;
 use MediaWiki\Extension\Notifications\Model\Event;
+use MediaWiki\Language\Language;
 use MediaWiki\User\User;
 
 /**

includes/Formatters/EchoPlainTextDigestEmailFormatter.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Extension\Notifications\Formatters;
 
-use Language;
+use MediaWiki\Language\Language;
 use MediaWiki\Parser\Sanitizer;
 use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\User\User;

includes/Formatters/EchoPresentationModelSection.php

@@ -3,9 +3,9 @@
 namespace MediaWiki\Extension\Notifications\Formatters;
 
 use BadMethodCallException;
-use Language;
 use MediaWiki\Extension\Notifications\DiscussionParser;
 use MediaWiki\Extension\Notifications\Model\Event;
+use MediaWiki\Language\Language;
 use MediaWiki\Parser\Parser;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Title\Title;

includes/Hooks.php

@@ -2,18 +2,16 @@
 
 namespace MediaWiki\Extension\Notifications;
 
-use ApiModuleManager;
-use Content;
 use EmailNotification;
-use ExtensionRegistry;
-use Language;
 use LogEntry;
 use LogicException;
 use MailAddress;
+use MediaWiki\Api\ApiModuleManager;
 use MediaWiki\Api\Hook\ApiMain__moduleManagerHook;
 use MediaWiki\Auth\AuthManager;
 use MediaWiki\Auth\Hook\LocalUserCreatedHook;
 use MediaWiki\Config\Config;
+use MediaWiki\Content\Content;
 use MediaWiki\DAO\WikiAwareEntity;
 use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Deferred\LinksUpdate\LinksTable;
@@ -39,6 +37,7 @@ use MediaWiki\Hook\SkinTemplateNavigation__UniversalHook;
 use MediaWiki\Hook\SpecialMuteModifyFormFieldsHook;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HTMLForm\Field\HTMLCheckMatrix;
+use MediaWiki\Language\Language;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
@@ -53,6 +52,7 @@ use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Preferences\Hook\GetPreferencesHook;
 use MediaWiki\Preferences\MultiTitleFilter;
 use MediaWiki\Preferences\MultiUsernameFilter;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\Request\WebRequest;
 use MediaWiki\ResourceLoader as RL;
 use MediaWiki\ResourceLoader\Hook\ResourceLoaderRegisterModulesHook;

includes/Model/Event.php

@@ -3,7 +3,6 @@
 namespace MediaWiki\Extension\Notifications\Model;
 
 use Exception;
-use IDBAccessObject;
 use InvalidArgumentException;
 use MediaWiki\Extension\Notifications\Bundleable;
 use MediaWiki\Extension\Notifications\Controller\NotificationController;
@@ -20,6 +19,7 @@ use MediaWiki\User\User;
 use MediaWiki\User\UserIdentity;
 use RuntimeException;
 use stdClass;
+use Wikimedia\Rdbms\IDBAccessObject;
 
 /**
  * Immutable class to represent an event.

includes/NotifUser.php

@@ -15,7 +15,7 @@ use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\Utils\MWTimestamp;
 use MediaWiki\WikiMap\WikiMap;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\ReadOnlyMode;
 

includes/OnWikiList.php

@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Extension\Notifications;
 
+use MediaWiki\Content\TextContent;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Title\Title;
-use TextContent;
 
 /**
  * Implements ContainmentList interface for sourcing a list of items from a wiki

includes/Push/Api/ApiEchoPushSubscriptions.php

@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Extension\Notifications\Push\Api;
 
-use ApiBase;
-use ApiModuleManager;
-use ApiUsageException;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiModuleManager;
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\MediaWikiServices;
 use Wikimedia\ParamValidator\ParamValidator;
 

includes/Push/Api/ApiEchoPushSubscriptionsCreate.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\Notifications\Push\Api;
 
-use ApiBase;
-use ApiMain;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiMain;
 use MediaWiki\Extension\Notifications\Push\SubscriptionManager;
 use MediaWiki\Extension\Notifications\Push\Utils;
 use MediaWiki\Extension\Notifications\Services;

includes/Push/Api/ApiEchoPushSubscriptionsDelete.php

@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Extension\Notifications\Push\Api;
 
-use ApiBase;
-use ApiMain;
-use ApiUsageException;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiMain;
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\Extension\Notifications\Push\SubscriptionManager;
 use MediaWiki\Extension\Notifications\Push\Utils;
 use MediaWiki\Extension\Notifications\Services;

includes/SeenTime.php

@@ -2,13 +2,13 @@
 
 namespace MediaWiki\Extension\Notifications;
 
-use BagOStuff;
-use CachedBagOStuff;
 use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\User\CentralId\CentralIdLookup;
 use MediaWiki\User\UserIdentity;
 use UnexpectedValueException;
+use Wikimedia\ObjectCache\BagOStuff;
+use Wikimedia\ObjectCache\CachedBagOStuff;
 
 /**
  * A small wrapper around ObjectCache to manage

maintenance/backfillUnreadWikis.php

@@ -4,6 +4,7 @@ use MediaWiki\Extension\Notifications\AttributeManager;
 use MediaWiki\Extension\Notifications\DbFactory;
 use MediaWiki\Extension\Notifications\NotifUser;
 use MediaWiki\Extension\Notifications\UnreadWikis;
+use MediaWiki\Maintenance\Maintenance;
 use MediaWiki\User\CentralId\CentralIdLookup;
 use MediaWiki\User\User;
 use MediaWiki\WikiMap\WikiMap;

maintenance/generateSampleNotifications.php

@@ -2,11 +2,15 @@
 // phpcs:disable Generic.Files.LineLength -- Long html test examples
 // @phan-file-suppress PhanUndeclaredClassMethod, PhanUndeclaredClassConstant Other extensions used for testing purposes
 
+use MediaWiki\Content\WikitextContent;
 use MediaWiki\Extension\Notifications\Model\Event;
+use MediaWiki\Maintenance\Maintenance;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
+use Wikimedia\Rdbms\IDBAccessObject;
 
 $IP = getenv( 'MW_INSTALL_PATH' );
 if ( $IP === false ) {

maintenance/processEchoEmailBatch.php

@@ -2,6 +2,7 @@
 
 use MediaWiki\Extension\Notifications\DbFactory;
 use MediaWiki\Extension\Notifications\EmailBatch;
+use MediaWiki\Maintenance\Maintenance;
 
 $IP = getenv( 'MW_INSTALL_PATH' );
 if ( $IP === false ) {

maintenance/recomputeNotifCounts.php

@@ -7,6 +7,7 @@
 
 use MediaWiki\Extension\Notifications\DbFactory;
 use MediaWiki\Extension\Notifications\NotifUser;
+use MediaWiki\Maintenance\Maintenance;
 use MediaWiki\User\User;
 
 require_once getenv( 'MW_INSTALL_PATH' ) !== false

maintenance/removeInvalidNotification.php

@@ -6,6 +6,7 @@
  */
 
 use MediaWiki\Extension\Notifications\DbFactory;
+use MediaWiki\Maintenance\Maintenance;
 
 require_once getenv( 'MW_INSTALL_PATH' ) !== false
 	? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'

maintenance/removeOrphanedEvents.php

@@ -6,6 +6,7 @@
  */
 
 use MediaWiki\Extension\Notifications\DbFactory;
+use MediaWiki\Maintenance\LoggedUpdateMaintenance;
 
 require_once getenv( 'MW_INSTALL_PATH' ) !== false
 	? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'

maintenance/updatePerUserBlacklist.php

@@ -5,6 +5,7 @@
  * @ingroup Maintenance
  */
 
+use MediaWiki\Maintenance\LoggedUpdateMaintenance;
 use MediaWiki\User\User;
 
 require_once getenv( 'MW_INSTALL_PATH' ) !== false

scripts/gen-autoload.php

@@ -2,6 +2,8 @@
 
 // Keep in sync with same script in Flow.
 
+use MediaWiki\Maintenance\Maintenance;
+
 require_once getenv( 'MW_INSTALL_PATH' ) !== false
 	? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'
 	: __DIR__ . '/../../../maintenance/Maintenance.php';

tests/phpunit/Api/ApiEchoCreateEventTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\Extension\Notifications\Mapper\NotificationMapper;
 use MediaWiki\Extension\Notifications\NotifUser;
 use MediaWiki\Tests\Api\ApiTestCase;

tests/phpunit/ContainmentSetTest.php

@@ -2,13 +2,13 @@
 
 namespace MediaWiki\Extension\Notifications\Test;
 
-use HashBagOStuff;
 use MediaWiki\Extension\Notifications\ArrayList;
 use MediaWiki\Extension\Notifications\CachedList;
 use MediaWiki\Extension\Notifications\ContainmentSet;
 use MediaWiki\Extension\Notifications\OnWikiList;
 use MediaWikiIntegrationTestCase;
-use WANObjectCache;
+use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 
 /**
  * @covers \MediaWiki\Extension\Notifications\ContainmentSet

tests/phpunit/UserLocatorTest.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Extension\Notifications\Test;
 
-use ContentHandler;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Extension\Notifications\Model\Event;
 use MediaWiki\Extension\Notifications\UserLocator;
 use MediaWiki\Title\Title;