Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use namespaced classes #483

Merged
merged 2 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extension.json
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
}
},
"ConfigRegistry": {
"managewiki": "GlobalVarConfig::newInstance"
"managewiki": "MediaWiki\\Config\\GlobalVarConfig::newInstance"
},
"ServiceWiringFiles": [
"includes/ServiceWiring.php"
Expand Down
10 changes: 5 additions & 5 deletions includes/FormFactory/ManageWikiFormFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

namespace Miraheze\ManageWiki\FormFactory;

use Config;
use Html;
use HTMLForm;
use IContextSource;
use MediaWiki\Config\Config;
use MediaWiki\Context\IContextSource;
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;

Expand Down
12 changes: 6 additions & 6 deletions includes/FormFactory/ManageWikiFormFactoryBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions includes/Helpers/ManageWikiDeletedWikiPager.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion includes/Helpers/ManageWikiExtensions.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion includes/Helpers/ManageWikiInstaller.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions includes/Helpers/ManageWikiNamespaces.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion includes/Helpers/ManageWikiOOUIForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

namespace Miraheze\ManageWiki\Helpers;

use MediaWiki\HTMLForm\OOUIHTMLForm;
use OOUI\ButtonInputWidget;
use OOUI\FieldsetLayout;
use OOUI\HtmlSnippet;
use OOUI\IndexLayout;
use OOUI\PanelLayout;
use OOUI\TabPanelLayout;
use OOUI\Widget;
use OOUIHTMLForm;
use Xml;

class ManageWikiOOUIForm extends OOUIHTMLForm {
Expand Down
4 changes: 2 additions & 2 deletions includes/Helpers/ManageWikiPermissions.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
4 changes: 2 additions & 2 deletions includes/Helpers/ManageWikiRequirements.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion includes/Helpers/ManageWikiSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion includes/Helpers/ManageWikiTypes.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
6 changes: 3 additions & 3 deletions includes/Hooks.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion includes/Hooks/ManageWikiCoreAddFormFieldsHook.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Miraheze\ManageWiki\Hooks;

use IContextSource;
use MediaWiki\Context\IContextSource;

interface ManageWikiCoreAddFormFieldsHook {

Expand Down
2 changes: 1 addition & 1 deletion includes/Hooks/ManageWikiCoreFormSubmissionHook.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Miraheze\ManageWiki\Hooks;

use IContextSource;
use MediaWiki\Context\IContextSource;
use Miraheze\CreateWiki\RemoteWiki;
use Wikimedia\Rdbms\DBConnRef;

Expand Down
2 changes: 1 addition & 1 deletion includes/Jobs/MWScriptJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Job;
use MediaWiki\Shell\Shell;
use Title;
use MediaWiki\Title\Title;

class MWScriptJob extends Job {

Expand Down
2 changes: 1 addition & 1 deletion includes/Jobs/NamespaceMigrationJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion includes/ManageWiki.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

use DateTimeZone;
use MediaWiki\MediaWikiServices;
use MediaWiki\User\User;
use Miraheze\CreateWiki\RemoteWiki;
use User;

class ManageWiki {

Expand Down
2 changes: 1 addition & 1 deletion includes/Specials/SpecialDeletedWikis.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Miraheze\ManageWiki\Specials;

use MediaWiki\SpecialPage\SpecialPage;
use Miraheze\ManageWiki\Helpers\ManageWikiDeletedWikiPager;
use SpecialPage;

class SpecialDeletedWikis extends SpecialPage {

Expand Down
8 changes: 4 additions & 4 deletions includes/Specials/SpecialManageWiki.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -16,7 +17,6 @@
use Miraheze\ManageWiki\ManageWiki;
use OOUI\FieldLayout;
use OOUI\SearchInputWidget;
use SpecialPage;

class SpecialManageWiki extends SpecialPage {

Expand Down
10 changes: 5 additions & 5 deletions includes/Specials/SpecialManageWikiDefaultPermissions.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -18,7 +19,6 @@
use Miraheze\ManageWiki\Helpers\ManageWikiPermissions;
use Miraheze\ManageWiki\Hooks;
use Miraheze\ManageWiki\ManageWiki;
use SpecialPage;

class SpecialManageWikiDefaultPermissions extends SpecialPage {

Expand Down
2 changes: 1 addition & 1 deletion tests/phpunit/QueryWikiConfigTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Miraheze\ManageWiki\Tests;

use ApiTestCase;
use MediaWiki\Tests\Api\ApiTestCase;

/**
* @group ManageWiki
Expand Down