[MediaWiki-commits] [Gerrit] Added 'name' value to jsConfigBlock, init cleanup - change (mediawiki...ZeroBanner)
Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163804
Change subject: Added 'name' value to jsConfigBlock, init cleanup
..
Added 'name' value to jsConfigBlock, init cleanup
* A localized 'name' will be included in the js config block if available
* ext initialization has been cleaned up a bit
Change-Id: Ic4aaf5883496c53e3dc43c22131700d4cdc533b2
---
M ZeroBanner.php
M includes/PageRendering.php
M includes/ZeroSpecialPage.php
3 files changed, 29 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroBanner
refs/changes/04/163804/1
diff --git a/ZeroBanner.php b/ZeroBanner.php
index 2d06d09..f8e34db 100644
--- a/ZeroBanner.php
+++ b/ZeroBanner.php
@@ -26,35 +26,34 @@
'url' = 'https://www.mediawiki.org/wiki/Extension:ZeroBanner',
);
-$cwd = __DIR__ . DIRECTORY_SEPARATOR;
-$wgMessagesDirs['ZeroBanner'] = $cwd . 'i18n';
-$wgExtensionMessagesFiles['ZeroBanner'] = $cwd . 'ZeroBanner.i18n.php';
-$wgExtensionMessagesFiles['ZeroBannerAlias'] = $cwd . ZeroBanner.alias.php;
+$zbDir = __DIR__ . DIRECTORY_SEPARATOR;
+$wgMessagesDirs['ZeroBanner'] = $zbDir . 'i18n';
+$wgExtensionMessagesFiles['ZeroBanner'] = $zbDir . 'ZeroBanner.i18n.php';
+$wgExtensionMessagesFiles['ZeroBannerAlias'] = $zbDir . ZeroBanner.alias.php;
$wgSpecialPages['ZeroRatedMobileAccess'] = 'ZeroBanner\ZeroSpecialPage';
$wgSpecialPageGroups['ZeroRatedMobileAccess'] = 'other';
-$wgExtensionMessagesFiles['ZeroRatedMobileAccessAlias'] = $cwd .
ZeroBanner.alias.php;
+$wgExtensionMessagesFiles['ZeroRatedMobileAccessAlias'] = $zbDir .
ZeroBanner.alias.php;
// autoload extension classes
-$cwd .= 'includes' . DIRECTORY_SEPARATOR;
-$autoloadClasses = array (
- 'ApiRawJsonPrinter' = 'ApiZeroBanner',
- 'ApiZeroBanner' = 'ApiZeroBanner',
- 'MccMncLogging' = 'MccMncLogging',
- 'PageRendering' = 'PageRendering',
- 'PageRenderingHooks' = 'PageRenderingHooks',
- 'ZeroConfig' = 'ZeroConfig',
- 'ZeroSpecialPage' = 'ZeroSpecialPage',
-);
-foreach ( $autoloadClasses as $className = $classFilename ) {
- $wgAutoloadClasses['ZeroBanner\\' . $className] = $cwd . $classFilename
. '.php';
+$zbDir .= 'includes' . DIRECTORY_SEPARATOR;
+foreach ( array(
+ 'ApiRawJsonPrinter' = 'ApiZeroBanner',
+ 'ApiZeroBanner',
+ 'MccMncLogging',
+ 'PageRendering',
+ 'PageRenderingHooks',
+ 'ZeroConfig',
+ 'ZeroSpecialPage',
+ ) as $key = $class ) {
+ $wgAutoloadClasses['ZeroBanner\\' . ( is_string( $key ) ? $key : $class
)] = $zbDir . $class . '.php';
}
+unset( $zbDir );
-$localBasePath = __DIR__;
$remoteExtPath = 'ZeroBanner';
$wgResourceModules['zerobanner.styles'] = array(
- 'localBasePath' = $localBasePath,
+ 'localBasePath' = __DIR__,
'remoteExtPath' = $remoteExtPath,
'targets' = 'mobile',
'styles' = array( 'modules/banner.css', 'modules/redux.less' ),
@@ -62,7 +61,7 @@
// this resource is used by the ZeroPortal to display banners on the desktop
site
$wgResourceModules['zerobanner.config.styles'] = array(
- 'localBasePath' = $localBasePath,
+ 'localBasePath' = __DIR__,
'remoteExtPath' = $remoteExtPath,
'targets' = array( 'desktop', 'mobile' ),
'styles' = 'modules/banner.css',
@@ -70,9 +69,9 @@
$wgResourceModules['zerobanner'] = array(
'dependencies' = array( 'mobile.stable', 'mobile.templates',
'zerobanner.styles', 'mobile.overlays' ),
- 'localBasePath' = $localBasePath,
+ 'localBasePath' = __DIR__,
'remoteExtPath' = $remoteExtPath,
- 'localTemplateBasePath' = $localBasePath . '/templates',
+ 'localTemplateBasePath' = __DIR__ . '/templates',
'templates' = array( 'interstitial.hogan', 'zeroinfo.hogan' ),
// Use Mantle Resource Loader module
'class' = 'ResourceLoaderTemplateModule',
@@ -97,14 +96,14 @@
);
$wgResourceModules['zerobanner.special.scripts'] = array(
- 'localBasePath' = $localBasePath,
+ 'localBasePath' = __DIR__,
'remoteExtPath' = $remoteExtPath,
'targets' = array( 'mobile' ),
'scripts' = array( 'modules/forms.js' ),
);
$wgResourceModules['zerobanner.special.styles'] = array(
- 'localBasePath' = $localBasePath,
+ 'localBasePath' = __DIR__,
'remoteExtPath' = $remoteExtPath,
'targets' = array( 'mobile' ),
'styles' = array( 'modules/forms.css' ),
diff --git a/includes/PageRendering.php b/includes/PageRendering.php
index 3016b1d..88bcb95 100644
--- a/includes/PageRendering.php
+++ b/includes/PageRendering.php
@@ -70,12 +70,13 @@
}
/**
+* @param \ContextSource|\SpecialPage $ctxSrc
* @param string $id
* @param null|ZeroConfig $config
* @param bool $enabled
[MediaWiki-commits] [Gerrit] Added 'name' value to jsConfigBlock, init cleanup - change (mediawiki...ZeroBanner)
jenkins-bot has submitted this change and it was merged.
Change subject: Added 'name' value to jsConfigBlock, init cleanup
..
Added 'name' value to jsConfigBlock, init cleanup
* A localized 'name' will be included in the js config block if available
* ext initialization has been cleaned up a bit
Change-Id: Ic4aaf5883496c53e3dc43c22131700d4cdc533b2
---
M ZeroBanner.php
M includes/PageRendering.php
M includes/ZeroSpecialPage.php
3 files changed, 29 insertions(+), 28 deletions(-)
Approvals:
Dr0ptp4kt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ZeroBanner.php b/ZeroBanner.php
index 2d06d09..f8e34db 100644
--- a/ZeroBanner.php
+++ b/ZeroBanner.php
@@ -26,35 +26,34 @@
'url' = 'https://www.mediawiki.org/wiki/Extension:ZeroBanner',
);
-$cwd = __DIR__ . DIRECTORY_SEPARATOR;
-$wgMessagesDirs['ZeroBanner'] = $cwd . 'i18n';
-$wgExtensionMessagesFiles['ZeroBanner'] = $cwd . 'ZeroBanner.i18n.php';
-$wgExtensionMessagesFiles['ZeroBannerAlias'] = $cwd . ZeroBanner.alias.php;
+$zbDir = __DIR__ . DIRECTORY_SEPARATOR;
+$wgMessagesDirs['ZeroBanner'] = $zbDir . 'i18n';
+$wgExtensionMessagesFiles['ZeroBanner'] = $zbDir . 'ZeroBanner.i18n.php';
+$wgExtensionMessagesFiles['ZeroBannerAlias'] = $zbDir . ZeroBanner.alias.php;
$wgSpecialPages['ZeroRatedMobileAccess'] = 'ZeroBanner\ZeroSpecialPage';
$wgSpecialPageGroups['ZeroRatedMobileAccess'] = 'other';
-$wgExtensionMessagesFiles['ZeroRatedMobileAccessAlias'] = $cwd .
ZeroBanner.alias.php;
+$wgExtensionMessagesFiles['ZeroRatedMobileAccessAlias'] = $zbDir .
ZeroBanner.alias.php;
// autoload extension classes
-$cwd .= 'includes' . DIRECTORY_SEPARATOR;
-$autoloadClasses = array (
- 'ApiRawJsonPrinter' = 'ApiZeroBanner',
- 'ApiZeroBanner' = 'ApiZeroBanner',
- 'MccMncLogging' = 'MccMncLogging',
- 'PageRendering' = 'PageRendering',
- 'PageRenderingHooks' = 'PageRenderingHooks',
- 'ZeroConfig' = 'ZeroConfig',
- 'ZeroSpecialPage' = 'ZeroSpecialPage',
-);
-foreach ( $autoloadClasses as $className = $classFilename ) {
- $wgAutoloadClasses['ZeroBanner\\' . $className] = $cwd . $classFilename
. '.php';
+$zbDir .= 'includes' . DIRECTORY_SEPARATOR;
+foreach ( array(
+ 'ApiRawJsonPrinter' = 'ApiZeroBanner',
+ 'ApiZeroBanner',
+ 'MccMncLogging',
+ 'PageRendering',
+ 'PageRenderingHooks',
+ 'ZeroConfig',
+ 'ZeroSpecialPage',
+ ) as $key = $class ) {
+ $wgAutoloadClasses['ZeroBanner\\' . ( is_string( $key ) ? $key : $class
)] = $zbDir . $class . '.php';
}
+unset( $zbDir );
-$localBasePath = __DIR__;
$remoteExtPath = 'ZeroBanner';
$wgResourceModules['zerobanner.styles'] = array(
- 'localBasePath' = $localBasePath,
+ 'localBasePath' = __DIR__,
'remoteExtPath' = $remoteExtPath,
'targets' = 'mobile',
'styles' = array( 'modules/banner.css', 'modules/redux.less' ),
@@ -62,7 +61,7 @@
// this resource is used by the ZeroPortal to display banners on the desktop
site
$wgResourceModules['zerobanner.config.styles'] = array(
- 'localBasePath' = $localBasePath,
+ 'localBasePath' = __DIR__,
'remoteExtPath' = $remoteExtPath,
'targets' = array( 'desktop', 'mobile' ),
'styles' = 'modules/banner.css',
@@ -70,9 +69,9 @@
$wgResourceModules['zerobanner'] = array(
'dependencies' = array( 'mobile.stable', 'mobile.templates',
'zerobanner.styles', 'mobile.overlays' ),
- 'localBasePath' = $localBasePath,
+ 'localBasePath' = __DIR__,
'remoteExtPath' = $remoteExtPath,
- 'localTemplateBasePath' = $localBasePath . '/templates',
+ 'localTemplateBasePath' = __DIR__ . '/templates',
'templates' = array( 'interstitial.hogan', 'zeroinfo.hogan' ),
// Use Mantle Resource Loader module
'class' = 'ResourceLoaderTemplateModule',
@@ -97,14 +96,14 @@
);
$wgResourceModules['zerobanner.special.scripts'] = array(
- 'localBasePath' = $localBasePath,
+ 'localBasePath' = __DIR__,
'remoteExtPath' = $remoteExtPath,
'targets' = array( 'mobile' ),
'scripts' = array( 'modules/forms.js' ),
);
$wgResourceModules['zerobanner.special.styles'] = array(
- 'localBasePath' = $localBasePath,
+ 'localBasePath' = __DIR__,
'remoteExtPath' = $remoteExtPath,
'targets' = array( 'mobile' ),
'styles' = array( 'modules/forms.css' ),
diff --git a/includes/PageRendering.php b/includes/PageRendering.php
index 3016b1d..88bcb95 100644
--- a/includes/PageRendering.php
+++ b/includes/PageRendering.php
@@ -70,12 +70,13 @@
}
/**
+* @param \ContextSource|\SpecialPage $ctxSrc
* @param string $id
* @param null|ZeroConfig $config
* @param bool $enabled
* @return string
*/
- public
