jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398501 )
Change subject: Namespace and PSR-4 this extension
......................................................................
Namespace and PSR-4 this extension
Change-Id: I7e4414b2cae44883e0923e01b55ec4d696833ea9
---
M extension.json
M generateTables.php
M includes/HieroTokenizer.php
R includes/Hooks.php
M includes/SpecialHieroglyphs.php
M includes/WikiHiero.php
6 files changed, 30 insertions(+), 11 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index ac2b6c3..ad61c34 100644
--- a/extension.json
+++ b/extension.json
@@ -10,11 +10,11 @@
"license-name": "GPL-2.0+",
"type": "parserhook",
"requires": {
- "MediaWiki": ">= 1.25.0"
+ "MediaWiki": ">= 1.31.0"
},
"Hooks": {
"ParserFirstCallInit": [
- "WikiHieroHooks::onParserFirstCallInit"
+ "WikiHiero\\Hooks::onParserFirstCallInit"
]
},
"MessagesDirs": {
@@ -25,17 +25,14 @@
"ExtensionMessagesFiles": {
"HieroglyphsAlias": "wikihiero.alias.php"
},
- "AutoloadClasses": {
- "WikiHiero": "includes/WikiHiero.php",
- "SpecialHieroglyphs": "includes/SpecialHieroglyphs.php",
- "HieroTokenizer": "includes/HieroTokenizer.php",
- "WikiHieroHooks": "includes/WikiHieroHooks.php"
+ "AutoloadNamespaces": {
+ "WikiHiero\\": "includes/"
},
"ParserTestFiles": [
"tests.txt"
],
"SpecialPages": {
- "Hieroglyphs": "SpecialHieroglyphs"
+ "Hieroglyphs": "WikiHiero\\SpecialHieroglyphs"
},
"ResourceFileModulePaths": {
"localBasePath": "modules",
diff --git a/generateTables.php b/generateTables.php
index d96bdd6..fa0d7d9 100644
--- a/generateTables.php
+++ b/generateTables.php
@@ -22,6 +22,8 @@
* http://www.gnu.org/copyleft/gpl.html
*/
+use WikiHiero\WikiHiero;
+
$IP = getenv( 'MW_INSTALL_PATH' );
if ( $IP === false ) {
$IP = __DIR__ . '/../..';
diff --git a/includes/HieroTokenizer.php b/includes/HieroTokenizer.php
index 1521ad0..ed373a5 100644
--- a/includes/HieroTokenizer.php
+++ b/includes/HieroTokenizer.php
@@ -18,6 +18,8 @@
* http://www.gnu.org/copyleft/gpl.html
*/
+namespace WikiHiero;
+
/**
* Hieroglyphs tokenizer
*/
diff --git a/includes/WikiHieroHooks.php b/includes/Hooks.php
similarity index 70%
rename from includes/WikiHieroHooks.php
rename to includes/Hooks.php
index 40bb5b7..8b1cb2f 100644
--- a/includes/WikiHieroHooks.php
+++ b/includes/Hooks.php
@@ -1,5 +1,10 @@
<?php
-class WikiHieroHooks {
+
+namespace WikiHiero;
+
+use Parser;
+
+class Hooks {
/**
* Because <hiero> tag is used rarely, we don't need to load its body
on every hook call,
* so we keep our simple hook handlers here.
@@ -8,7 +13,7 @@
* @return bool
*/
public static function onParserFirstCallInit( &$parser ) {
- $parser->setHook( 'hiero', 'WikiHiero::parserHook' );
+ $parser->setHook( 'hiero', WikiHiero::class . '::parserHook' );
return true;
}
}
diff --git a/includes/SpecialHieroglyphs.php b/includes/SpecialHieroglyphs.php
index 570192e..5fb90ac 100644
--- a/includes/SpecialHieroglyphs.php
+++ b/includes/SpecialHieroglyphs.php
@@ -17,6 +17,11 @@
* http://www.gnu.org/copyleft/gpl.html
*/
+namespace WikiHiero;
+
+use Html;
+use SpecialPage;
+
class SpecialHieroglyphs extends SpecialPage {
const HIEROGLYPHS_PER_ROW = 10;
const CACHE_EXPIRY = 86400; // 1 day
diff --git a/includes/WikiHiero.php b/includes/WikiHiero.php
index d2dfc4c..e9972b0 100644
--- a/includes/WikiHiero.php
+++ b/includes/WikiHiero.php
@@ -1,5 +1,4 @@
<?php
-
/**
* WikiHiero - A PHP convert from text using "Manual for the encoding of
* hieroglyphic texts for computer input" syntax to HTML entities (table and
@@ -23,6 +22,15 @@
* http://www.gnu.org/copyleft/gpl.html
*/
+namespace WikiHiero;
+
+use Config;
+use Html;
+use MWException;
+use OutputPage;
+use Parser;
+use RequestContext;
+
class WikiHiero {
const IMAGE_EXT = 'png';
const IMAGE_PREFIX = 'hiero_';
--
To view, visit https://gerrit.wikimedia.org/r/398501
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7e4414b2cae44883e0923e01b55ec4d696833ea9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/wikihiero
Gerrit-Branch: master
Gerrit-Owner: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
