From bfaa13382e4bbb2737db4a9a3b9b22ba05bcaa45 Mon Sep 17 00:00:00 2001 From: CosmicAlpha Date: Thu, 26 Sep 2024 00:50:11 +0800 Subject: [PATCH 1/2] Use namespaced classes --- extension.json | 2 +- includes/FormFactory/ManageWikiFormFactory.php | 10 +++++----- .../FormFactory/ManageWikiFormFactoryBuilder.php | 12 ++++++------ includes/Helpers/ManageWikiDeletedWikiPager.php | 6 +++--- includes/Helpers/ManageWikiExtensions.php | 2 +- includes/Helpers/ManageWikiInstaller.php | 2 +- includes/Helpers/ManageWikiNamespaces.php | 4 ++-- includes/Helpers/ManageWikiOOUIForm.php | 2 +- includes/Helpers/ManageWikiPermissions.php | 4 ++-- includes/Helpers/ManageWikiRequirements.php | 4 ++-- includes/Helpers/ManageWikiSettings.php | 2 +- includes/Helpers/ManageWikiTypes.php | 2 +- includes/Hooks.php | 6 +++--- includes/Hooks/ManageWikiCoreAddFormFieldsHook.php | 2 +- includes/Hooks/ManageWikiCoreFormSubmissionHook.php | 2 +- includes/Jobs/MWScriptJob.php | 2 +- includes/Jobs/NamespaceMigrationJob.php | 2 +- includes/ManageWiki.php | 2 +- includes/Specials/SpecialDeletedWikis.php | 2 +- includes/Specials/SpecialManageWiki.php | 8 ++++---- .../Specials/SpecialManageWikiDefaultPermissions.php | 10 +++++----- tests/phpunit/QueryWikiConfigTest.php | 2 +- 22 files changed, 45 insertions(+), 45 deletions(-) diff --git a/extension.json b/extension.json index dbd7220de..a366f2205 100644 --- a/extension.json +++ b/extension.json @@ -275,7 +275,7 @@ } }, "ConfigRegistry": { - "managewiki": "GlobalVarConfig::newInstance" + "managewiki": "MediaWiki\\Config\\GlobalVarConfig::newInstance" }, "ServiceWiringFiles": [ "includes/ServiceWiring.php" diff --git a/includes/FormFactory/ManageWikiFormFactory.php b/includes/FormFactory/ManageWikiFormFactory.php index b24323260..abf8e9f8b 100644 --- a/includes/FormFactory/ManageWikiFormFactory.php +++ b/includes/FormFactory/ManageWikiFormFactory.php @@ -2,15 +2,15 @@ namespace Miraheze\ManageWiki\FormFactory; -use Config; -use Html; -use HTMLForm; -use IContextSource; +use MediaWiki\Context\IContextSource; +use MediaWiki\Config\Config; +use MediaWiki\Html\Html; +use MediaWiki\HTMLForm\HTMLForm; use MediaWiki\MediaWikiServices; +use MediaWiki\Output\OutputPage; use Miraheze\CreateWiki\RemoteWiki; use Miraheze\ManageWiki\Helpers\ManageWikiOOUIForm; use Miraheze\ManageWiki\ManageWiki; -use OutputPage; use UnexpectedValueException; use Wikimedia\Rdbms\DBConnRef; diff --git a/includes/FormFactory/ManageWikiFormFactoryBuilder.php b/includes/FormFactory/ManageWikiFormFactoryBuilder.php index f2a4e13e2..d5ca66bc2 100644 --- a/includes/FormFactory/ManageWikiFormFactoryBuilder.php +++ b/includes/FormFactory/ManageWikiFormFactoryBuilder.php @@ -2,16 +2,18 @@ namespace Miraheze\ManageWiki\FormFactory; -use Config; use ExtensionProcessor; use ExtensionRegistry; -use HTMLForm; -use IContextSource; use InvalidArgumentException; -use Linker; use ManualLogEntry; +use MediaWiki\Config\Config; +use MediaWiki\Context\IContextSource; use MediaWiki\Context\RequestContext; +use MediaWiki\HTMLForm\HTMLForm; +use MediaWiki\Linker\Linker; use MediaWiki\MediaWikiServices; +use MediaWiki\SpecialPage\SpecialPage; +use MediaWiki\User\User; use Miraheze\CreateWiki\RemoteWiki; use Miraheze\ManageWiki\Helpers\ManageWikiExtensions; use Miraheze\ManageWiki\Helpers\ManageWikiNamespaces; @@ -20,8 +22,6 @@ use Miraheze\ManageWiki\Helpers\ManageWikiSettings; use Miraheze\ManageWiki\Helpers\ManageWikiTypes; use Miraheze\ManageWiki\ManageWiki; -use SpecialPage; -use User; use Wikimedia\Rdbms\DBConnRef; class ManageWikiFormFactoryBuilder { diff --git a/includes/Helpers/ManageWikiDeletedWikiPager.php b/includes/Helpers/ManageWikiDeletedWikiPager.php index 3ddd91aa1..73bd360b4 100644 --- a/includes/Helpers/ManageWikiDeletedWikiPager.php +++ b/includes/Helpers/ManageWikiDeletedWikiPager.php @@ -2,10 +2,10 @@ namespace Miraheze\ManageWiki\Helpers; -use Linker; +use MediaWiki\Linker\Linker; use MediaWiki\MediaWikiServices; -use SpecialPage; -use TablePager; +use MediaWiki\Pager\TablePager; +use MediaWiki\SpecialPage\SpecialPage; class ManageWikiDeletedWikiPager extends TablePager { diff --git a/includes/Helpers/ManageWikiExtensions.php b/includes/Helpers/ManageWikiExtensions.php index e753148ad..5738c9bc4 100644 --- a/includes/Helpers/ManageWikiExtensions.php +++ b/includes/Helpers/ManageWikiExtensions.php @@ -2,7 +2,7 @@ namespace Miraheze\ManageWiki\Helpers; -use Config; +use MediaWiki\Config\Config; use MediaWiki\MediaWikiServices; use Miraheze\CreateWiki\CreateWikiJson; use Miraheze\CreateWiki\CreateWikiPhp; diff --git a/includes/Helpers/ManageWikiInstaller.php b/includes/Helpers/ManageWikiInstaller.php index 2ad0ca147..0a183324f 100644 --- a/includes/Helpers/ManageWikiInstaller.php +++ b/includes/Helpers/ManageWikiInstaller.php @@ -5,9 +5,9 @@ use Exception; use MediaWiki\MediaWikiServices; use MediaWiki\Shell\Shell; +use MediaWiki\Title\Title; use Miraheze\ManageWiki\Jobs\MWScriptJob; use RuntimeException; -use Title; class ManageWikiInstaller { diff --git a/includes/Helpers/ManageWikiNamespaces.php b/includes/Helpers/ManageWikiNamespaces.php index f1c5431b4..2422e9cca 100644 --- a/includes/Helpers/ManageWikiNamespaces.php +++ b/includes/Helpers/ManageWikiNamespaces.php @@ -2,12 +2,12 @@ namespace Miraheze\ManageWiki\Helpers; -use Config; +use MediaWiki\Config\Config; use MediaWiki\MediaWikiServices; +use MediaWiki\SpecialPage\SpecialPage; use Miraheze\CreateWiki\CreateWikiJson; use Miraheze\CreateWiki\CreateWikiPhp; use Miraheze\ManageWiki\Jobs\NamespaceMigrationJob; -use SpecialPage; use Wikimedia\Rdbms\MaintainableDBConnRef; /** diff --git a/includes/Helpers/ManageWikiOOUIForm.php b/includes/Helpers/ManageWikiOOUIForm.php index e51623adc..983073fd0 100644 --- a/includes/Helpers/ManageWikiOOUIForm.php +++ b/includes/Helpers/ManageWikiOOUIForm.php @@ -2,6 +2,7 @@ namespace Miraheze\ManageWiki\Helpers; +use MediaWiki\HTMLForm\OOUIHTMLForm; use OOUI\ButtonInputWidget; use OOUI\FieldsetLayout; use OOUI\HtmlSnippet; @@ -9,7 +10,6 @@ use OOUI\PanelLayout; use OOUI\TabPanelLayout; use OOUI\Widget; -use OOUIHTMLForm; use Xml; class ManageWikiOOUIForm extends OOUIHTMLForm { diff --git a/includes/Helpers/ManageWikiPermissions.php b/includes/Helpers/ManageWikiPermissions.php index 78068b398..6fb593eb2 100644 --- a/includes/Helpers/ManageWikiPermissions.php +++ b/includes/Helpers/ManageWikiPermissions.php @@ -2,11 +2,11 @@ namespace Miraheze\ManageWiki\Helpers; -use Config; +use MediaWiki\Config\Config; use MediaWiki\MediaWikiServices; +use MediaWiki\User\User; use Miraheze\CreateWiki\CreateWikiJson; use Miraheze\CreateWiki\CreateWikiPhp; -use User; use Wikimedia\Rdbms\MaintainableDBConnRef; /** diff --git a/includes/Helpers/ManageWikiRequirements.php b/includes/Helpers/ManageWikiRequirements.php index 0665b427f..167113c3b 100644 --- a/includes/Helpers/ManageWikiRequirements.php +++ b/includes/Helpers/ManageWikiRequirements.php @@ -2,10 +2,10 @@ namespace Miraheze\ManageWiki\Helpers; +use MediaWiki\Context\RequestContext; use MediaWiki\MediaWikiServices; +use MediaWiki\SiteStats\SiteStats; use Miraheze\CreateWiki\RemoteWiki; -use RequestContext; -use SiteStats; /** * Helper class for de-centralising requirement checking diff --git a/includes/Helpers/ManageWikiSettings.php b/includes/Helpers/ManageWikiSettings.php index d4ff021f2..336a3cd51 100644 --- a/includes/Helpers/ManageWikiSettings.php +++ b/includes/Helpers/ManageWikiSettings.php @@ -2,7 +2,7 @@ namespace Miraheze\ManageWiki\Helpers; -use Config; +use MediaWiki\Config\Config; use MediaWiki\MediaWikiServices; use Miraheze\CreateWiki\CreateWikiJson; use Miraheze\CreateWiki\CreateWikiPhp; diff --git a/includes/Helpers/ManageWikiTypes.php b/includes/Helpers/ManageWikiTypes.php index 81610ef5f..77cfb1ca6 100644 --- a/includes/Helpers/ManageWikiTypes.php +++ b/includes/Helpers/ManageWikiTypes.php @@ -5,8 +5,8 @@ use ContentHandler; use MediaWiki\Context\RequestContext; use MediaWiki\MediaWikiServices; +use MediaWiki\Status\Status; use Miraheze\ManageWiki\ManageWiki; -use Status; class ManageWikiTypes { diff --git a/includes/Hooks.php b/includes/Hooks.php index 354578f60..99d0d7687 100644 --- a/includes/Hooks.php +++ b/includes/Hooks.php @@ -2,16 +2,16 @@ namespace Miraheze\ManageWiki; -use DatabaseUpdater; use Exception; +use MediaWiki\Installer\DatabaseUpdater; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MediaWikiServices; +use MediaWiki\SpecialPage\SpecialPage; +use MediaWiki\User\User; use Miraheze\ManageWiki\Helpers\ManageWikiExtensions; use Miraheze\ManageWiki\Helpers\ManageWikiNamespaces; use Miraheze\ManageWiki\Helpers\ManageWikiPermissions; -use SpecialPage; use TextContentHandler; -use User; use Wikimedia\Rdbms\DBConnRef; class Hooks { diff --git a/includes/Hooks/ManageWikiCoreAddFormFieldsHook.php b/includes/Hooks/ManageWikiCoreAddFormFieldsHook.php index ce3e6e58e..ad3424e3c 100644 --- a/includes/Hooks/ManageWikiCoreAddFormFieldsHook.php +++ b/includes/Hooks/ManageWikiCoreAddFormFieldsHook.php @@ -2,7 +2,7 @@ namespace Miraheze\ManageWiki\Hooks; -use IContextSource; +use MediaWiki\Context\IContextSource; interface ManageWikiCoreAddFormFieldsHook { diff --git a/includes/Hooks/ManageWikiCoreFormSubmissionHook.php b/includes/Hooks/ManageWikiCoreFormSubmissionHook.php index 61db0447e..d5289ae0c 100644 --- a/includes/Hooks/ManageWikiCoreFormSubmissionHook.php +++ b/includes/Hooks/ManageWikiCoreFormSubmissionHook.php @@ -2,7 +2,7 @@ namespace Miraheze\ManageWiki\Hooks; -use IContextSource; +use MediaWiki\Context\IContextSource; use Miraheze\CreateWiki\RemoteWiki; use Wikimedia\Rdbms\DBConnRef; diff --git a/includes/Jobs/MWScriptJob.php b/includes/Jobs/MWScriptJob.php index 80ab55b0c..52e74ddfc 100644 --- a/includes/Jobs/MWScriptJob.php +++ b/includes/Jobs/MWScriptJob.php @@ -4,7 +4,7 @@ use Job; use MediaWiki\Shell\Shell; -use Title; +use MediaWiki\Title\Title; class MWScriptJob extends Job { diff --git a/includes/Jobs/NamespaceMigrationJob.php b/includes/Jobs/NamespaceMigrationJob.php index f5988e785..408f9d131 100644 --- a/includes/Jobs/NamespaceMigrationJob.php +++ b/includes/Jobs/NamespaceMigrationJob.php @@ -4,7 +4,7 @@ use Job; use MediaWiki\MediaWikiServices; -use Title; +use MediaWiki\Title\Title; /** * Used on namespace creation and deletion to move pages into and out of namespaces diff --git a/includes/ManageWiki.php b/includes/ManageWiki.php index c3952e4e8..e5d31049b 100644 --- a/includes/ManageWiki.php +++ b/includes/ManageWiki.php @@ -4,8 +4,8 @@ use DateTimeZone; use MediaWiki\MediaWikiServices; +use MediaWiki\User\User; use Miraheze\CreateWiki\RemoteWiki; -use User; class ManageWiki { diff --git a/includes/Specials/SpecialDeletedWikis.php b/includes/Specials/SpecialDeletedWikis.php index b151e98bb..144cb6279 100644 --- a/includes/Specials/SpecialDeletedWikis.php +++ b/includes/Specials/SpecialDeletedWikis.php @@ -2,8 +2,8 @@ namespace Miraheze\ManageWiki\Specials; +use MediaWiki\SpecialPage\SpecialPage; use Miraheze\ManageWiki\Helpers\ManageWikiDeletedWikiPager; -use SpecialPage; class SpecialDeletedWikis extends SpecialPage { diff --git a/includes/Specials/SpecialManageWiki.php b/includes/Specials/SpecialManageWiki.php index 424559d56..a884982d6 100644 --- a/includes/Specials/SpecialManageWiki.php +++ b/includes/Specials/SpecialManageWiki.php @@ -2,11 +2,12 @@ namespace Miraheze\ManageWiki\Specials; -use Config; -use Html; -use HTMLForm; +use MediaWiki\Config\Config; use MediaWiki\Context\RequestContext; +use MediaWiki\Html\Html; +use MediaWiki\HTMLForm\HTMLForm; use MediaWiki\MediaWikiServices; +use MediaWiki\SpecialPage\SpecialPage; use Miraheze\CreateWiki\Hooks\CreateWikiHookRunner; use Miraheze\CreateWiki\RemoteWiki; use Miraheze\CreateWiki\WikiManager; @@ -16,7 +17,6 @@ use Miraheze\ManageWiki\ManageWiki; use OOUI\FieldLayout; use OOUI\SearchInputWidget; -use SpecialPage; class SpecialManageWiki extends SpecialPage { diff --git a/includes/Specials/SpecialManageWikiDefaultPermissions.php b/includes/Specials/SpecialManageWikiDefaultPermissions.php index 29a1f1649..801a47376 100644 --- a/includes/Specials/SpecialManageWikiDefaultPermissions.php +++ b/includes/Specials/SpecialManageWikiDefaultPermissions.php @@ -2,14 +2,15 @@ namespace Miraheze\ManageWiki\Specials; -use Config; use ErrorPageError; -use GlobalVarConfig; -use Html; -use HTMLForm; use ManualLogEntry; +use MediaWiki\Config\Config; +use MediaWiki\Config\GlobalVarConfig; use MediaWiki\Context\RequestContext; +use MediaWiki\Html\Html; +use MediaWiki\HTMLForm\HTMLForm; use MediaWiki\MediaWikiServices; +use MediaWiki\SpecialPage\SpecialPage; use Miraheze\CreateWiki\CreateWikiJson; use Miraheze\CreateWiki\CreateWikiPhp; use Miraheze\CreateWiki\Hooks\CreateWikiHookRunner; @@ -18,7 +19,6 @@ use Miraheze\ManageWiki\Helpers\ManageWikiPermissions; use Miraheze\ManageWiki\Hooks; use Miraheze\ManageWiki\ManageWiki; -use SpecialPage; class SpecialManageWikiDefaultPermissions extends SpecialPage { diff --git a/tests/phpunit/QueryWikiConfigTest.php b/tests/phpunit/QueryWikiConfigTest.php index 82ce3ca10..dd8823a2f 100644 --- a/tests/phpunit/QueryWikiConfigTest.php +++ b/tests/phpunit/QueryWikiConfigTest.php @@ -2,7 +2,7 @@ namespace Miraheze\ManageWiki\Tests; -use ApiTestCase; +use MediaWiki\Tests\Api\ApiTestCase; /** * @group ManageWiki From f36ce92fbe59ae2044ac492f2e50237e2c4819d7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 25 Sep 2024 16:51:53 +0000 Subject: [PATCH 2/2] CI: lint code to MediaWiki standards Check commit and GitHub actions for more details --- includes/FormFactory/ManageWikiFormFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/FormFactory/ManageWikiFormFactory.php b/includes/FormFactory/ManageWikiFormFactory.php index abf8e9f8b..7582d4121 100644 --- a/includes/FormFactory/ManageWikiFormFactory.php +++ b/includes/FormFactory/ManageWikiFormFactory.php @@ -2,8 +2,8 @@ namespace Miraheze\ManageWiki\FormFactory; -use MediaWiki\Context\IContextSource; use MediaWiki\Config\Config; +use MediaWiki\Context\IContextSource; use MediaWiki\Html\Html; use MediaWiki\HTMLForm\HTMLForm; use MediaWiki\MediaWikiServices;