[MediaWiki-commits] [Gerrit] Fix numerous instances of indentation using spaces instead o... - change (mediawiki...CentralNotice)
Platonides has uploaded a new change for review.
https://gerrit.wikimedia.org/r/58231
Change subject: Fix numerous instances of indentation using spaces instead of
tabs.
..
Fix numerous instances of indentation using spaces instead of tabs.
Change-Id: Ia6ea9b9ebfc97af68dd94a3d66ccec51a5537328
---
M CentralNotice.php
M api/ApiCentralNoticeAllocations.php
M includes/BannerChooser.php
M includes/BannerMessageGroup.php
M special/SpecialBannerAllocation.php
M special/SpecialCentralNotice.php
M special/SpecialGlobalAllocation.php
M special/SpecialNoticeTemplate.php
M tests/ApiAllocationsTest.php
9 files changed, 70 insertions(+), 70 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/31/58231/1
diff --git a/CentralNotice.php b/CentralNotice.php
index d5b66c9..00074c3 100644
--- a/CentralNotice.php
+++ b/CentralNotice.php
@@ -10,7 +10,7 @@
* @license GNU General Public Licence 2.0 or later
*/
- $wgExtensionCredits[ 'other' ][] = array(
+$wgExtensionCredits[ 'other' ][] = array(
'path' = __FILE__,
'name' = 'CentralNotice',
'author' = array(
@@ -305,7 +305,7 @@
if ( $wgNoticeUseTranslateExtension ) {
$wgAutoloadClasses[ 'BannerMessageGroup' ] =
$includeDir . 'BannerMessageGroup.php';
$wgHooks[ 'TranslatePostInitGroups' ][ ] =
'efRegisterMessageGroups';
-$wgHooks[ 'TranslateEventMessageGroupStateChange' ][] = array(
'BannerMessageGroup::updateBannerGroupStateHook' );
+ $wgHooks[ 'TranslateEventMessageGroupStateChange' ][] =
array( 'BannerMessageGroup::updateBannerGroupStateHook' );
}
$wgSpecialPages[ 'CentralNotice' ] = 'CentralNotice';
@@ -479,10 +479,10 @@
$vars[ 'wgCentralBannerDispatcher' ] = $wgCentralBannerDispatcher;
$vars[ 'wgCentralBannerRecorder' ] = $wgCentralBannerRecorder;
$vars[ 'wgNoticeXXCountries' ] = $wgNoticeXXCountries;
-$vars[ 'wgNoticeNumberOfBuckets' ] = $wgNoticeNumberOfBuckets;
-$vars[ 'wgNoticeBucketExpiry' ] = $wgNoticeBucketExpiry;
-$vars[ 'wgNoticeNumberOfControllerBuckets' ] =
$wgNoticeNumberOfControllerBuckets;
-$vars[ 'wgNoticeCookieShortExpiry' ] = $wgNoticeCookieShortExpiry;
+ $vars[ 'wgNoticeNumberOfBuckets' ] = $wgNoticeNumberOfBuckets;
+ $vars[ 'wgNoticeBucketExpiry' ] = $wgNoticeBucketExpiry;
+ $vars[ 'wgNoticeNumberOfControllerBuckets' ] =
$wgNoticeNumberOfControllerBuckets;
+ $vars[ 'wgNoticeCookieShortExpiry' ] = $wgNoticeCookieShortExpiry;
if ( $wgNoticeInfrastructure ) {
$vars[ 'wgNoticeCloseButton' ] = $wgNoticeCloseButton;
diff --git a/api/ApiCentralNoticeAllocations.php
b/api/ApiCentralNoticeAllocations.php
index 4105da9..e37dcfc 100644
--- a/api/ApiCentralNoticeAllocations.php
+++ b/api/ApiCentralNoticeAllocations.php
@@ -74,7 +74,7 @@
}
public function getParamDescription() {
-global $wgNoticeNumberOfBuckets;
+ global $wgNoticeNumberOfBuckets;
$params = array();
diff --git a/includes/BannerChooser.php b/includes/BannerChooser.php
index 3c1cb31..9ca5dd0 100644
--- a/includes/BannerChooser.php
+++ b/includes/BannerChooser.php
@@ -70,20 +70,20 @@
// Filter for device category
$filterColumn( $this-banners, 'device', $device );
-// Filter for the provided bucket.
+ // Filter for the provided bucket.
$this-banners = array_filter(
$this-banners,
function ( $banner ) use ( $bucket ) {
-global $wgNoticeNumberOfBuckets;
+ global $wgNoticeNumberOfBuckets;
-// In case we change the number of buckets available, will map
-// the banner bucket down
-$bannerBucket = intval( $banner[ 'bucket' ] ) %
$wgNoticeNumberOfBuckets;
+ // In case we change the number of buckets
available, will map
+ // the banner bucket down
+ $bannerBucket = intval( $banner[ 'bucket' ] ) %
$wgNoticeNumberOfBuckets;
-// Actual mapping. It is assumed the user always was randomly
choosing out
-// of a ring with $wgNoticeNumberOfBuckets choices. This
implies that we will
-// always be mapping the ring down, never up.
-$userBucket = intval( $bucket ) % intval( $banner[
'campaign_num_buckets' ] );
+ // Actual mapping. It is assumed the user
always was randomly choosing out
+ // of a ring with $wgNoticeNumberOfBuckets
choices. This implies that we will
+ // always be mapping the ring
[MediaWiki-commits] [Gerrit] Fix numerous instances of indentation using spaces instead o... - change (mediawiki...CentralNotice)
Adamw has submitted this change and it was merged.
Change subject: Fix numerous instances of indentation using spaces instead of
tabs.
..
Fix numerous instances of indentation using spaces instead of tabs.
Change-Id: Ia6ea9b9ebfc97af68dd94a3d66ccec51a5537328
---
M CentralNotice.php
M api/ApiCentralNoticeAllocations.php
M includes/BannerChooser.php
M includes/BannerMessageGroup.php
M special/SpecialBannerAllocation.php
M special/SpecialCentralNotice.php
M special/SpecialGlobalAllocation.php
M special/SpecialNoticeTemplate.php
M tests/ApiAllocationsTest.php
9 files changed, 70 insertions(+), 70 deletions(-)
Approvals:
Adamw: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/CentralNotice.php b/CentralNotice.php
index d5b66c9..00074c3 100644
--- a/CentralNotice.php
+++ b/CentralNotice.php
@@ -10,7 +10,7 @@
* @license GNU General Public Licence 2.0 or later
*/
- $wgExtensionCredits[ 'other' ][] = array(
+$wgExtensionCredits[ 'other' ][] = array(
'path' = __FILE__,
'name' = 'CentralNotice',
'author' = array(
@@ -305,7 +305,7 @@
if ( $wgNoticeUseTranslateExtension ) {
$wgAutoloadClasses[ 'BannerMessageGroup' ] =
$includeDir . 'BannerMessageGroup.php';
$wgHooks[ 'TranslatePostInitGroups' ][ ] =
'efRegisterMessageGroups';
-$wgHooks[ 'TranslateEventMessageGroupStateChange' ][] = array(
'BannerMessageGroup::updateBannerGroupStateHook' );
+ $wgHooks[ 'TranslateEventMessageGroupStateChange' ][] =
array( 'BannerMessageGroup::updateBannerGroupStateHook' );
}
$wgSpecialPages[ 'CentralNotice' ] = 'CentralNotice';
@@ -479,10 +479,10 @@
$vars[ 'wgCentralBannerDispatcher' ] = $wgCentralBannerDispatcher;
$vars[ 'wgCentralBannerRecorder' ] = $wgCentralBannerRecorder;
$vars[ 'wgNoticeXXCountries' ] = $wgNoticeXXCountries;
-$vars[ 'wgNoticeNumberOfBuckets' ] = $wgNoticeNumberOfBuckets;
-$vars[ 'wgNoticeBucketExpiry' ] = $wgNoticeBucketExpiry;
-$vars[ 'wgNoticeNumberOfControllerBuckets' ] =
$wgNoticeNumberOfControllerBuckets;
-$vars[ 'wgNoticeCookieShortExpiry' ] = $wgNoticeCookieShortExpiry;
+ $vars[ 'wgNoticeNumberOfBuckets' ] = $wgNoticeNumberOfBuckets;
+ $vars[ 'wgNoticeBucketExpiry' ] = $wgNoticeBucketExpiry;
+ $vars[ 'wgNoticeNumberOfControllerBuckets' ] =
$wgNoticeNumberOfControllerBuckets;
+ $vars[ 'wgNoticeCookieShortExpiry' ] = $wgNoticeCookieShortExpiry;
if ( $wgNoticeInfrastructure ) {
$vars[ 'wgNoticeCloseButton' ] = $wgNoticeCloseButton;
diff --git a/api/ApiCentralNoticeAllocations.php
b/api/ApiCentralNoticeAllocations.php
index 4105da9..e37dcfc 100644
--- a/api/ApiCentralNoticeAllocations.php
+++ b/api/ApiCentralNoticeAllocations.php
@@ -74,7 +74,7 @@
}
public function getParamDescription() {
-global $wgNoticeNumberOfBuckets;
+ global $wgNoticeNumberOfBuckets;
$params = array();
diff --git a/includes/BannerChooser.php b/includes/BannerChooser.php
index 3c1cb31..9ca5dd0 100644
--- a/includes/BannerChooser.php
+++ b/includes/BannerChooser.php
@@ -70,20 +70,20 @@
// Filter for device category
$filterColumn( $this-banners, 'device', $device );
-// Filter for the provided bucket.
+ // Filter for the provided bucket.
$this-banners = array_filter(
$this-banners,
function ( $banner ) use ( $bucket ) {
-global $wgNoticeNumberOfBuckets;
+ global $wgNoticeNumberOfBuckets;
-// In case we change the number of buckets available, will map
-// the banner bucket down
-$bannerBucket = intval( $banner[ 'bucket' ] ) %
$wgNoticeNumberOfBuckets;
+ // In case we change the number of buckets
available, will map
+ // the banner bucket down
+ $bannerBucket = intval( $banner[ 'bucket' ] ) %
$wgNoticeNumberOfBuckets;
-// Actual mapping. It is assumed the user always was randomly
choosing out
-// of a ring with $wgNoticeNumberOfBuckets choices. This
implies that we will
-// always be mapping the ring down, never up.
-$userBucket = intval( $bucket ) % intval( $banner[
'campaign_num_buckets' ] );
+ // Actual mapping. It is assumed the user
always was randomly choosing out
+ // of a ring with $wgNoticeNumberOfBuckets
choices. This implies that we will
+ // always be mapping the ring down, never up.
+ $userBucket =
