jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/366760 )
Change subject: Enable
Generic.ControlStructures.InlineControlStructure.NotAllowed
......................................................................
Enable Generic.ControlStructures.InlineControlStructure.NotAllowed
Change-Id: I07665bc13cb428888d8a8a423b465948f1a82edd
---
M phpcs.xml
M wmf-config/HHVMRequestInit.php
M wmf-config/PoolCounterSettings.php
M wmf-config/flaggedrevs.php
4 files changed, 10 insertions(+), 7 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/phpcs.xml b/phpcs.xml
index 58ff361..fddf578 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -28,9 +28,6 @@
<rule ref="Generic.CodeAnalysis.UnconditionalIfStatement.Found">
<severity>0</severity>
</rule>
- <rule ref="Generic.ControlStructures.InlineControlStructure.NotAllowed">
- <severity>0</severity>
- </rule>
<rule ref="Generic.Files.EndFileNewline.NotFound">
<severity>0</severity>
</rule>
diff --git a/wmf-config/HHVMRequestInit.php b/wmf-config/HHVMRequestInit.php
index 28b9065..5ca89ad 100644
--- a/wmf-config/HHVMRequestInit.php
+++ b/wmf-config/HHVMRequestInit.php
@@ -6,7 +6,9 @@
* request by setting the path to this file as the value of HHVM's
* `hhvm.server.request_init_document` setting.
*/
-if ( !defined( 'HHVM_VERSION' ) ) return;
+if ( !defined( 'HHVM_VERSION' ) ) {
+ return;
+}
/**
* Set up fatal error handler.
diff --git a/wmf-config/PoolCounterSettings.php
b/wmf-config/PoolCounterSettings.php
index a0062a0..c745ba6 100644
--- a/wmf-config/PoolCounterSettings.php
+++ b/wmf-config/PoolCounterSettings.php
@@ -1,6 +1,8 @@
<?php
-if ( !defined( 'MEDIAWIKI' ) ) exit( 1 );
+if ( !defined( 'MEDIAWIKI' ) ) {
+ exit( 1 );
+}
wfLoadExtension( 'PoolCounter' );
diff --git a/wmf-config/flaggedrevs.php b/wmf-config/flaggedrevs.php
index f249c95..5445799 100644
--- a/wmf-config/flaggedrevs.php
+++ b/wmf-config/flaggedrevs.php
@@ -463,10 +463,12 @@
$wgAddGroups['bureaucrat'][] = 'trusted';
$wgRemoveGroups['bureaucrat'][] = 'trusted';
// # Normally admins promote/demote editors...not here
- if ( is_array( $wgAddGroups['sysop'] ) )
+ if ( is_array( $wgAddGroups['sysop'] ) ) {
unset( $wgAddGroups['sysop'][ array_search( 'editor',
$wgAddGroups['sysop'] ) ] );
- if ( is_array( $wgRemoveGroups['sysop'] ) )
+ }
+ if ( is_array( $wgRemoveGroups['sysop'] ) ) {
unset( $wgRemoveGroups['sysop'][ array_search( 'editor',
$wgRemoveGroups['sysop'] ) ] );
+ }
// # Remove 'autoreview' user group; T74055
unset( $wgGroupPermissions['autoreview'] );
--
To view, visit https://gerrit.wikimedia.org/r/366760
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I07665bc13cb428888d8a8a423b465948f1a82edd
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
