MaxSem has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339586 )
Change subject: Namespace this extension
......................................................................
Namespace this extension
Bug: T154047
Change-Id: Ie955b72fda8ba5b387b75d80a2398c4f8219529d
---
M extension.json
M includes/ApiQueryGlobalUsage.php
M includes/GlobalUsage.php
M includes/GlobalUsageCachePurgeJob.php
M includes/GlobalUsageHooks.php
M includes/GlobalUsageImagePageHooks.php
M includes/GlobalUsageQuery.php
M includes/SpecialGlobalUsage.php
M includes/SpecialGloballyWantedFiles.php
M includes/SpecialMostGloballyLinkedFiles.php
10 files changed, 128 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalUsage
refs/changes/86/339586/1
diff --git a/extension.json b/extension.json
index 6712f4a..52826ed 100644
--- a/extension.json
+++ b/extension.json
@@ -7,15 +7,15 @@
"license-name": "MIT",
"type": "specialpage",
"SpecialPages": {
- "MostGloballyLinkedFiles": "MostGloballyLinkedFilesPage",
- "GloballyWantedFiles": "SpecialGloballyWantedFiles",
- "GlobalUsage": "SpecialGlobalUsage"
+ "MostGloballyLinkedFiles":
"GlobalUsage\\MostGloballyLinkedFilesPage",
+ "GloballyWantedFiles":
"GlobalUsage\\SpecialGloballyWantedFiles",
+ "GlobalUsage": "GlobalUsage\\SpecialGlobalUsage"
},
"JobClasses": {
- "globalUsageCachePurge": "GlobalUsageCachePurgeJob"
+ "globalUsageCachePurge": "GlobalUsage\\GlobalUsageCachePurgeJob"
},
"APIPropModules": {
- "globalusage": "ApiQueryGlobalUsage"
+ "globalusage": "GlobalUsage\\ApiQueryGlobalUsage"
},
"MessagesDirs": {
"GlobalUsage": [
@@ -26,15 +26,16 @@
"GlobalUsageAliases": "GlobalUsage.alias.php"
},
"AutoloadClasses": {
- "GlobalUsage": "includes/GlobalUsage.php",
- "GlobalUsageHooks": "includes/GlobalUsageHooks.php",
- "GlobalUsageImagePageHooks":
"includes/GlobalUsageImagePageHooks.php",
- "SpecialGlobalUsage": "includes/SpecialGlobalUsage.php",
- "GlobalUsageQuery": "includes/GlobalUsageQuery.php",
- "ApiQueryGlobalUsage": "includes/ApiQueryGlobalUsage.php",
+ "GlobalUsage\\GlobalUsage": "includes/GlobalUsage.php",
+ "GlobalUsage\\GlobalUsageHooks":
"includes/GlobalUsageHooks.php",
+ "GlobalUsage\\GlobalUsageImagePageHooks":
"includes/GlobalUsageImagePageHooks.php",
+ "GlobalUsage\\SpecialGlobalUsage":
"includes/SpecialGlobalUsage.php",
+ "GlobalUsage\\GlobalUsageQuery":
"includes/GlobalUsageQuery.php",
+ "GlobalUsage\\ApiQueryGlobalUsage":
"includes/ApiQueryGlobalUsage.php",
"GlobalUsageCachePurgeJob":
"includes/GlobalUsageCachePurgeJob.php",
- "MostGloballyLinkedFilesPage":
"includes/SpecialMostGloballyLinkedFiles.php",
- "SpecialGloballyWantedFiles":
"includes/SpecialGloballyWantedFiles.php"
+ "GlobalUsage\\GlobalUsageCachePurgeJob":
"includes/GlobalUsageCachePurgeJob.php",
+ "GlobalUsage\\MostGloballyLinkedFilesPage":
"includes/SpecialMostGloballyLinkedFiles.php",
+ "GlobalUsage\\SpecialGloballyWantedFiles":
"includes/SpecialGloballyWantedFiles.php"
},
"@doc": [
"Things that can cause link updates:",
@@ -45,37 +46,37 @@
],
"Hooks": {
"LinksUpdateComplete": [
- "GlobalUsageHooks::onLinksUpdateComplete"
+ "GlobalUsage\\GlobalUsageHooks::onLinksUpdateComplete"
],
"ArticleDeleteComplete": [
- "GlobalUsageHooks::onArticleDeleteComplete"
+ "GlobalUsage\\GlobalUsageHooks::onArticleDeleteComplete"
],
"FileDeleteComplete": [
- "GlobalUsageHooks::onFileDeleteComplete"
+ "GlobalUsage\\GlobalUsageHooks::onFileDeleteComplete"
],
"FileUndeleteComplete": [
- "GlobalUsageHooks::onFileUndeleteComplete"
+ "GlobalUsage\\GlobalUsageHooks::onFileUndeleteComplete"
],
"UploadComplete": [
- "GlobalUsageHooks::onUploadComplete"
+ "GlobalUsage\\GlobalUsageHooks::onUploadComplete"
],
"TitleMoveComplete": [
- "GlobalUsageHooks::onTitleMoveComplete"
+ "GlobalUsage\\GlobalUsageHooks::onTitleMoveComplete"
],
"ImagePageAfterImageLinks": [
- "GlobalUsageImagePageHooks::onImagePageAfterImageLinks"
+
"GlobalUsage\\GlobalUsageImagePageHooks::onImagePageAfterImageLinks"
],
"ImagePageShowTOC": [
- "GlobalUsageImagePageHooks::onImagePageShowTOC"
+
"GlobalUsage\\GlobalUsageImagePageHooks::onImagePageShowTOC"
],
"ParserTestTables": [
- "GlobalUsageHooks::onParserTestTables"
+ "GlobalUsage\\GlobalUsageHooks::onParserTestTables"
],
"LoadExtensionSchemaUpdates": [
- "GlobalUsageHooks::onLoadExtensionSchemaUpdates"
+
"GlobalUsage\\GlobalUsageHooks::onLoadExtensionSchemaUpdates"
],
"wgQueryPages": [
- "GlobalUsageHooks::onwgQueryPages"
+ "GlobalUsage\\GlobalUsageHooks::onwgQueryPages"
]
},
"config": {
diff --git a/includes/ApiQueryGlobalUsage.php b/includes/ApiQueryGlobalUsage.php
index ae6a9a3..f67ad52 100644
--- a/includes/ApiQueryGlobalUsage.php
+++ b/includes/ApiQueryGlobalUsage.php
@@ -22,6 +22,12 @@
* http://www.gnu.org/copyleft/gpl.html
*/
+namespace GlobalUsage;
+
+use ApiBase;
+use ApiQueryBase;
+use WikiMap;
+
class ApiQueryGlobalUsage extends ApiQueryBase {
public function __construct( $query, $moduleName ) {
parent :: __construct( $query, $moduleName, 'gu' );
diff --git a/includes/GlobalUsage.php b/includes/GlobalUsage.php
index 808264b..3760b32 100644
--- a/includes/GlobalUsage.php
+++ b/includes/GlobalUsage.php
@@ -1,5 +1,15 @@
<?php
+
+namespace GlobalUsage;
+
+use DeferredUpdates;
+use IContextSource;
+use IDatabase;
use MediaWiki\MediaWikiServices;
+use MWNamespace;
+use SpecialPageFactory;
+use Title;
+use WikiMap;
class GlobalUsage {
/** @var string */
diff --git a/includes/GlobalUsageCachePurgeJob.php
b/includes/GlobalUsageCachePurgeJob.php
index dfcc8a4..336e769 100644
--- a/includes/GlobalUsageCachePurgeJob.php
+++ b/includes/GlobalUsageCachePurgeJob.php
@@ -1,4 +1,12 @@
<?php
+
+namespace GlobalUsage;
+
+use HTMLCacheUpdateJob;
+use Job;
+use JobQueueGroup;
+use Title;
+
/**
* Class to insert HTMLCacheUpdate jobs on local wikis to purge all pages that
use
* a given shared file. Note that the global and local image link tables are
assumed
@@ -59,3 +67,5 @@
return true;
}
}
+
+class_alias( 'GlobalUsage\GlobalUsageCachePurgeJob',
'GlobalUsageCachePurgeJob' );
diff --git a/includes/GlobalUsageHooks.php b/includes/GlobalUsageHooks.php
index e8252c0..e8959e2 100644
--- a/includes/GlobalUsageHooks.php
+++ b/includes/GlobalUsageHooks.php
@@ -1,10 +1,22 @@
<?php
+
+namespace GlobalUsage;
+
+use Article;
+use DatabaseUpdater;
+use File;
+use FileRepo;
+use JobQueueGroup;
+use LinksUpdate;
+use RepoGroup;
+use Title;
+use User;
+
/**
* GlobalUsage hooks for updating globalimagelinks table.
*
* UI hooks in SpecialGlobalUsage.
*/
-
class GlobalUsageHooks {
/**
* Hook to LinksUpdateComplete
diff --git a/includes/GlobalUsageImagePageHooks.php
b/includes/GlobalUsageImagePageHooks.php
index 1334132..f16aea0 100644
--- a/includes/GlobalUsageImagePageHooks.php
+++ b/includes/GlobalUsageImagePageHooks.php
@@ -1,5 +1,12 @@
<?php
+namespace GlobalUsage;
+
+use ImagePage;
+use Sanitizer;
+use Title;
+use WikiMap;
+
class GlobalUsageImagePageHooks {
private static $queryCache = array();
diff --git a/includes/GlobalUsageQuery.php b/includes/GlobalUsageQuery.php
index 55820c1..5c68ee7 100644
--- a/includes/GlobalUsageQuery.php
+++ b/includes/GlobalUsageQuery.php
@@ -1,4 +1,9 @@
<?php
+
+namespace GlobalUsage;
+use IDatabase;
+use Title;
+
/**
* A helper class to query the globalimagelinks table
*
@@ -12,6 +17,11 @@
private $reversed = false;
/**
+ * @var IDatabase
+ */
+ private $db;
+
+ /**
* @var Title|array
*/
private $target;
diff --git a/includes/SpecialGlobalUsage.php b/includes/SpecialGlobalUsage.php
index abfbc9d..e65cdbb 100644
--- a/includes/SpecialGlobalUsage.php
+++ b/includes/SpecialGlobalUsage.php
@@ -1,9 +1,25 @@
<?php
+
+namespace GlobalUsage;
+
+use Html;
+use Linker;
+use OOUI\ButtonInputWidget;
+use OOUI\CheckboxInputWidget;
+use OOUI\FieldLayout;
+use OOUI\FieldsetLayout;
+use OOUI\FormLayout;
+use OOUI\HtmlSnippet;
+use OOUI\PanelLayout;
+use OOUI\TextInputWidget;
+use SpecialPage;
+use Title;
+use WikiMap;
+
/**
* Special page to show global file usage. Also contains hook functions for
* showing usage on an image page.
*/
-
class SpecialGlobalUsage extends SpecialPage {
/**
* @var Title
@@ -54,14 +70,14 @@
$this->getOutput()->enableOOUI();
/* Build form */
- $form = new OOUI\FormLayout( [
+ $form = new FormLayout( [
'method' => 'get',
'action' => $wgScript,
] );
$fields = [];
- $fields[] = new OOUI\FieldLayout(
- new OOUI\TextInputWidget( [
+ $fields[] = new FieldLayout(
+ new TextInputWidget( [
'name' => 'target',
'id' => 'target',
'autosize' => true,
@@ -75,8 +91,8 @@
);
// Filter local checkbox
- $fields[] = new OOUI\FieldLayout(
- new OOUI\CheckboxInputWidget( [
+ $fields[] = new FieldLayout(
+ new CheckboxInputWidget( [
'name' => 'filterlocal',
'id' => 'mw-filterlocal',
'value' => '1',
@@ -89,8 +105,8 @@
);
// Submit button
- $fields[] = new OOUI\FieldLayout(
- new OOUI\ButtonInputWidget( [
+ $fields[] = new FieldLayout(
+ new ButtonInputWidget( [
'value' => $this->msg( 'globalusage-ok'
)->text(),
'label' => $this->msg( 'globalusage-ok'
)->text(),
'flags' => [ 'primary', 'progressive' ],
@@ -101,7 +117,7 @@
]
);
- $fieldset = new OOUI\FieldsetLayout( [
+ $fieldset = new FieldsetLayout( [
'label' => $this->msg( 'globalusage-text' )->text(),
'id' => 'globalusage-text',
'items' => $fields,
@@ -109,14 +125,14 @@
$form->appendContent(
$fieldset,
- new OOUI\HtmlSnippet(
+ new HtmlSnippet(
Html::hidden( 'title',
$this->getPageTitle()->getPrefixedText() ) .
Html::hidden( 'limit',
$this->getRequest()->getInt( 'limit', 50 ) )
)
);
$this->getOutput()->addHTML(
- new OOUI\PanelLayout( [
+ new PanelLayout( [
'expanded' => false,
'padded' => true,
'framed' => true,
diff --git a/includes/SpecialGloballyWantedFiles.php
b/includes/SpecialGloballyWantedFiles.php
index 3471c96..f3ab5b3 100644
--- a/includes/SpecialGloballyWantedFiles.php
+++ b/includes/SpecialGloballyWantedFiles.php
@@ -7,6 +7,19 @@
* @author Brian Wolff <bawolff...@gmail.com>
* @ingroup SpecialPage
*/
+
+namespace GlobalUsage;
+
+use Html;
+use Linker;
+use RepoGroup;
+use Skin;
+use SpecialPage;
+use stdClass;
+use Title;
+use WantedFilesPage;
+use WantedQueryPage;
+
class SpecialGloballyWantedFiles extends WantedFilesPage {
function __construct( $name = 'GloballyWantedFiles' ) {
diff --git a/includes/SpecialMostGloballyLinkedFiles.php
b/includes/SpecialMostGloballyLinkedFiles.php
index f705393..2940edc 100644
--- a/includes/SpecialMostGloballyLinkedFiles.php
+++ b/includes/SpecialMostGloballyLinkedFiles.php
@@ -7,6 +7,11 @@
* @author Brian Wolff <bawolff...@gmail.com>
*/
+namespace GlobalUsage;
+
+use Exception;
+use MostimagesPage;
+
class MostGloballyLinkedFilesPage extends MostimagesPage {
function __construct( $name = 'MostGloballyLinkedFiles' ) {
@@ -16,6 +21,8 @@
/**
* Main execution function. Use the parent if we're on the right wiki.
* If we're not on a shared repo, try to redirect there.
+ *
+ * @param string $par
*/
function execute( $par ) {
global $wgGlobalUsageSharedRepoWiki;
--
To view, visit https://gerrit.wikimedia.org/r/339586
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie955b72fda8ba5b387b75d80a2398c4f8219529d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalUsage
Gerrit-Branch: master
Gerrit-Owner: MaxSem <maxsem.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
