[MediaWiki-commits] [Gerrit] mediawiki...CreateRedirect[master]: Convert CreateRedirect to use extension registration

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373736 )

Change subject: Convert CreateRedirect to use extension registration
..


Convert CreateRedirect to use extension registration

Bug: T174131
Co-Authored-By: Jack Phoenix 
Change-Id: I697d2973fbed517801213827fca69472faf1fbfe
---
M CreateRedirect.alias.php
M CreateRedirect.body.php
A CreateRedirect.hooks.php
D CreateRedirect.i18n.php
M CreateRedirect.php
A extension.json
6 files changed, 253 insertions(+), 268 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/CreateRedirect.alias.php b/CreateRedirect.alias.php
index 5eef869..35b0bc7 100644
--- a/CreateRedirect.alias.php
+++ b/CreateRedirect.alias.php
@@ -7,239 +7,239 @@
  */
 // @codingStandardsIgnoreFile
 
-$specialPageAliases = array();
+$specialPageAliases = [];
 
-/** English (English) */
-$specialPageAliases['en'] = array(
-   'CreateRedirect' => array( 'CreateRedirect' ),
-);
+/** English */
+$specialPageAliases['en'] = [
+   'CreateRedirect' => [ 'CreateRedirect' ],
+];
 
 /** Arabic (العربية) */
-$specialPageAliases['ar'] = array(
-   'CreateRedirect' => array( 'إنشاء_تحويلة' ),
-);
+$specialPageAliases['ar'] = [
+   'CreateRedirect' => [ 'إنشاء_تحويلة' ],
+];
 
 /** Egyptian Arabic (مصرى) */
-$specialPageAliases['arz'] = array(
-   'CreateRedirect' => array( 'عمل_تحويله' ),
-);
+$specialPageAliases['arz'] = [
+   'CreateRedirect' => [ 'عمل_تحويله' ],
+];
 
 /** Assamese (অসমীয়া) */
-$specialPageAliases['as'] = array(
-   'CreateRedirect' => array( 'পুণঃনিৰ্দেশনা_সৃষ্টি' ),
-);
+$specialPageAliases['as'] = [
+   'CreateRedirect' => [ 'পুণঃনিৰ্দেশনা_সৃষ্টি' ],
+];
 
 /** Western Balochi (بلوچی رخشانی) */
-$specialPageAliases['bgn'] = array(
-   'CreateRedirect' => array( 'تغیری_مسیری_ئی_جۆڑ_کورتین' ),
-);
+$specialPageAliases['bgn'] = [
+   'CreateRedirect' => [ 'تغیری_مسیری_ئی_جۆڑ_کورتین' ],
+];
 
 /** Breton (brezhoneg) */
-$specialPageAliases['br'] = array(
-   'CreateRedirect' => array( 'KrouiñAdkas' ),
-);
+$specialPageAliases['br'] = [
+   'CreateRedirect' => [ 'KrouiñAdkas' ],
+];
 
 /** Min Dong Chinese (Mìng-dĕ̤ng-ngṳ̄) */
-$specialPageAliases['cdo'] = array(
-   'CreateRedirect' => array( '創建重定向' ),
-);
+$specialPageAliases['cdo'] = [
+   'CreateRedirect' => [ '創建重定向' ],
+];
 
 /** Czech (čeština) */
-$specialPageAliases['cs'] = array(
-   'CreateRedirect' => array( 'Vytvořit_přesměrování', 
'Vytvorit_presmerovani' ),
-);
+$specialPageAliases['cs'] = [
+   'CreateRedirect' => [ 'Vytvořit_přesměrování', 'Vytvorit_presmerovani' 
],
+];
 
 /** German (Deutsch) */
-$specialPageAliases['de'] = array(
-   'CreateRedirect' => array( 'Weiterleitung_erstellen' ),
-);
+$specialPageAliases['de'] = [
+   'CreateRedirect' => [ 'Weiterleitung_erstellen' ],
+];
 
 /** Zazaki (Zazaki) */
-$specialPageAliases['diq'] = array(
-   'CreateRedirect' => array( 'SerberdışVıraze' ),
-);
+$specialPageAliases['diq'] = [
+   'CreateRedirect' => [ 'SerberdışVıraze' ],
+];
 
 /** Greek (Ελληνικά) */
-$specialPageAliases['el'] = array(
-   'CreateRedirect' => array( 'ΔημιουργίαΑνακατεύθυνσης' ),
-);
+$specialPageAliases['el'] = [
+   'CreateRedirect' => [ 'ΔημιουργίαΑνακατεύθυνσης' ],
+];
 
 /** Esperanto (Esperanto) */
-$specialPageAliases['eo'] = array(
-   'CreateRedirect' => array( 'Krei_alidirektilon', 'Krei_alidirekton', 
'Kreu_alidirekton' ),
-);
+$specialPageAliases['eo'] = [
+   'CreateRedirect' => [ 'Krei_alidirektilon', 'Krei_alidirekton', 
'Kreu_alidirekton' ],
+];
 
 /** Persian (فارسی) */
-$specialPageAliases['fa'] = array(
-   'CreateRedirect' => array( 'ایجاد_تغییرمسیر' ),
-);
+$specialPageAliases['fa'] = [
+   'CreateRedirect' => [ 'ایجاد_تغییرمسیر' ],
+];
 
 /** Finnish (suomi) */
-$specialPageAliases['fi'] = array(
-   'CreateRedirect' => array( 'Luo_ohjaus' ),
-);
+$specialPageAliases['fi'] = [
+   'CreateRedirect' => [ 'Luo_ohjaus' ],
+];
 
 /** French (français) */
-$specialPageAliases['fr'] = array(
-   'CreateRedirect' => array( 'CréerRedirection', 'Créer_redirection' ),
-);
+$specialPageAliases['fr'] = [
+   'CreateRedirect' => [ 'CréerRedirection', 'Créer_redirection' ],
+];
 
 /** Arpitan (arpetan) */
-$specialPageAliases['frp'] = array(
-   'CreateRedirect' => array( 'Fâre_una_redirèccion', 'FâreUnaRedirèccion' 
),
-);
+$specialPageAliases['frp'] = [
+   'CreateRedirect' => [ 'Fâre_una_redirèccion', 'FâreUnaRedirèccion' ],
+];
 
 /** Galician (galego) */
-$specialPageAliases['gl'] = array(
-   'CreateRedirect' => array( 'Crear_unha_redirección' ),
-);
+$specialPageAliases['gl'] = [
+   'CreateRedirect' => [ 'Crear_unha_redirección' ],
+];
 
 /** Hebrew (עברית) */
-$specialPageAliases['he'] = array(
-   'CreateRedirect' => array( 'יצירת_הפניה' ),
-);

[MediaWiki-commits] [Gerrit] mediawiki...CreateRedirect[master]: Convert CreateRedirect to use extension registration

[Reception123 (Code Review)]

Reception123 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373736 )

Change subject: Convert CreateRedirect to use extension registration
..

Convert CreateRedirect to use extension registration

Bug: T174131
Change-Id: I697d2973fbed517801213827fca69472faf1fbfe
---
M CreateRedirect.body.php
M CreateRedirect.php
A extension.json
3 files changed, 65 insertions(+), 51 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CreateRedirect 
refs/changes/36/373736/1

diff --git a/CreateRedirect.body.php b/CreateRedirect.body.php
index f959a54..79da848 100644
--- a/CreateRedirect.body.php
+++ b/CreateRedirect.body.php
@@ -206,6 +206,34 @@
 END
);
}
+   
+   /**
+ * Adds a shortcut link pointing to Special:CreateRedirect to the "toolbox" 
menu.
+ * If applicable, also adds a reference to the current title as a GET param.
+ *
+ * @return Boolean: true
+ */
+function createRedirect_AddToolboxLink( &$tpl ) {
+   global $wgRequest;
+
+   // 1. Determine whether to actually add the link at all.
+   // There are certain cases, e.g. in the edit dialog, in a special page,
+   // where it's inappropriate for the link to appear.
+   // 2. Check the title. Is it a "Special:" page? Don't display the link.
+   $action = $wgRequest->getText( 'action', 'view' );
+   $title = $tpl->getSkin()->getTitle();
+
+   if( $action != 'view' && $action != 'purge' && !$title->isSpecialPage() 
) {
+   return true;
+   }
+
+   // 3. Add the link!
+   $href = SpecialPage::getTitleFor( 'CreateRedirect', 
$title->getPrefixedText() )->getLocalURL();
+   echo Html::rawElement( 'li', null, Html::element( 'a', array( 'href' => 
$href ), wfMessage( 'createredirect' )->text() ) );
+
+   return true;
+}
+
 
protected function getGroupName() {
return 'pagetools';
diff --git a/CreateRedirect.php b/CreateRedirect.php
index f9b8cc6..b19d219 100644
--- a/CreateRedirect.php
+++ b/CreateRedirect.php
@@ -29,55 +29,14 @@
  * along with CreateRedirect.  If not, see .
  */
 
-if( !defined( 'MEDIAWIKI' ) ) {
-   echo( "This file is an extension to the MediaWiki software and cannot 
be used standalone.\n" );
-   die( 1 );
-}
-
-// Add this extension to Special:Credits.
-$wgExtensionCredits['specialpage'][] = array(
-   'path'  => __FILE__,
-   'name' => 'CreateRedirect',
-   'author' => 'Marco Zafra',
-   'version' => '1.1.0',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:CreateRedirect',
-   'descriptionmsg' => 'createredirect-desc',
-);
-
-// Set up the actual extension functionality.
-$dir = dirname( __FILE__ ) . '/';
-$wgAutoloadClasses['SpecialCreateRedirect'] = $dir . 'CreateRedirect.body.php';
-$wgSpecialPages['CreateRedirect'] = 'SpecialCreateRedirect';
-$wgMessagesDirs['CreateRedirect'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['CreateRedirect'] = $dir . 'CreateRedirect.i18n.php';
-$wgExtensionMessagesFiles['CreateRedirectAlias'] = $dir . 
'CreateRedirect.alias.php';
-
-// Add a shortcut link to the toolbox.
-$wgHooks['SkinTemplateToolboxEnd'][] = 'createRedirect_addToolboxLink';
-
-/**
- * Adds a shortcut link pointing to Special:CreateRedirect to the "toolbox" 
menu.
- * If applicable, also adds a reference to the current title as a GET param.
- *
- * @return Boolean: true
- */
-function createRedirect_AddToolboxLink( &$tpl ) {
-   global $wgRequest;
-
-   // 1. Determine whether to actually add the link at all.
-   // There are certain cases, e.g. in the edit dialog, in a special page,
-   // where it's inappropriate for the link to appear.
-   // 2. Check the title. Is it a "Special:" page? Don't display the link.
-   $action = $wgRequest->getText( 'action', 'view' );
-   $title = $tpl->getSkin()->getTitle();
-
-   if( $action != 'view' && $action != 'purge' && !$title->isSpecialPage() 
) {
-   return true;
-   }
-
-   // 3. Add the link!
-   $href = SpecialPage::getTitleFor( 'CreateRedirect', 
$title->getPrefixedText() )->getLocalURL();
-   echo Html::rawElement( 'li', null, Html::element( 'a', array( 'href' => 
$href ), wfMessage( 'createredirect' )->text() ) );
-
-   return true;
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'CreateRedirect' );
+   $wgMessageDirs['CreateRedirect'] = __DIR__ . '/i18n';
+   wfWarn(
+   'Deprecated PHP entry point used for CreateRedirect extension. 
' .
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   );
+} else {
+   die( 'This version of the CreateRedirect extension requires MediaWiki 
1.29+' );
 }
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..1ee955a