jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/400995 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
The following sniffs are failing and were disabled:
* Squiz.Scope.MemberVarScope.Missing
* Squiz.Scope.MethodScope.Missing
The following sniffs now pass and were enabled:
* Generic.ControlStructures.InlineControlStructure.NotAllowed
* Generic.Formatting.DisallowMultipleStatements.SameLine
* MediaWiki.ControlStructures.IfElseStructure.SpaceAfterElse
* MediaWiki.ControlStructures.IfElseStructure.SpaceBeforeElse
* Squiz.WhiteSpace.ScopeClosingBrace.Indent
Change-Id: I6dcf52d28003087ff631cb69484280a29d2e327f
---
M .phpcs.xml
M ApexTemplate.php
M composer.json
3 files changed, 28 insertions(+), 15 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.phpcs.xml b/.phpcs.xml
index 6df021b..76de051 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,15 +2,12 @@
<ruleset>
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
<!-- Disable failing rules -->
- <exclude
name="Generic.ControlStructures.InlineControlStructure.NotAllowed"/>
<exclude name="Generic.Files.LineLength.TooLong"/>
- <exclude
name="Generic.Formatting.DisallowMultipleStatements.SameLine"/>
<exclude
name="MediaWiki.AlternativeSyntax.AlternativeSyntax.AlternativeSyntax"/>
- <exclude
name="MediaWiki.ControlStructures.IfElseStructure.SpaceBeforeElse"/>
<exclude name="PSR2.Classes.PropertyDeclaration.ScopeMissing"/>
- <exclude name="PSR2.Classes.PropertyDeclaration.VarUsed"/>
- <exclude name="Squiz.WhiteSpace.ScopeClosingBrace.Indent"/>
- <exclude
name="MediaWiki.ControlStructures.IfElseStructure.SpaceAfterElse"/>
+ <exclude name="PSR2.Classes.PropertyDeclaration.VarUsed" />
+ <exclude name="Squiz.Scope.MemberVarScope.Missing" />
+ <exclude name="Squiz.Scope.MethodScope.Missing" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamTag"/>
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamName"/>
<exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment"/>
diff --git a/ApexTemplate.php b/ApexTemplate.php
index 14f8b32..9c14d6c 100644
--- a/ApexTemplate.php
+++ b/ApexTemplate.php
@@ -212,7 +212,10 @@
}
?>
<div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php
echo Linker::tooltip( 'p-' . $name ) ?>>
- <h5<?php $this->html( 'userlangattributes' ) ?>><?php $msgObj =
wfMessage( $msg ); echo htmlspecialchars( $msgObj->exists() ? $msgObj->text() :
$msg ); ?></h5>
+ <h5<?php $this->html( 'userlangattributes' ) ?>><?php
+ $msgObj = wfMessage( $msg );
+ echo htmlspecialchars( $msgObj->exists() ? $msgObj->text() :
$msg );
+ ?></h5>
<div class="body">
<?php
if ( is_array( $content ) ): ?>
@@ -260,7 +263,10 @@
switch ( $element ) {
case 'NAMESPACES':
?>
-<div id="p-namespaces" class="apex-tabs<?php if ( count(
$this->data['namespace_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
+<div id="p-namespaces" class="apex-tabs<?php
+ if ( count( $this->data['namespace_urls'] ) == 0 ) {
+ echo ' emptyPortlet';
+ } ?>">
<h5><?php $this->msg( 'namespaces' ) ?></h5>
<ul<?php $this->html( 'userlangattributes' ) ?>>
<?php foreach ( $this->data['namespace_urls'] as $link ): ?>
@@ -272,7 +278,10 @@
break;
case 'VARIANTS':
?>
-<div id="p-variants" class="apex-menu<?php if ( count(
$this->data['variant_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
+<div id="p-variants" class="apex-menu<?php
+ if ( count( $this->data['variant_urls'] ) == 0 ) {
+ echo ' emptyPortlet';
+ } ?>">
<h4>
<?php foreach ( $this->data['variant_urls'] as $link ): ?>
<?php if ( stripos( $link['attributes'], 'selected' ) !== false
): ?>
@@ -293,9 +302,10 @@
break;
case 'VIEWS':
?>
-<div id="p-views" class="apex-tabs<?php if ( count( $this->data['view_urls'] )
== 0 ) {
- echo ' emptyPortlet';
-} ?>">
+<div id="p-views" class="apex-tabs<?php
+ if ( count( $this->data['view_urls'] ) == 0 ) {
+ echo ' emptyPortlet';
+ } ?>">
<h5><?php $this->msg( 'views' ) ?></h5>
<ul<?php $this->html( 'userlangattributes' ) ?>>
<?php foreach ( $this->data['view_urls'] as $link ): ?>
@@ -312,7 +322,10 @@
break;
case 'ACTIONS':
?>
-<div id="p-cactions" class="apex-menu<?php if ( count(
$this->data['action_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
+<div id="p-cactions" class="apex-menu<?php
+ if ( count( $this->data['action_urls'] ) == 0 ) {
+ echo ' emptyPortlet';
+ } ?>">
<h5><span><?php $this->msg( 'actions' ) ?></span><a href="#"></a></h5>
<div class="apex-menu-popup">
<ul<?php $this->html( 'userlangattributes' ) ?>>
@@ -326,7 +339,10 @@
break;
case 'PERSONAL':
?>
-<div id="p-personal" class="<?php if ( count( $this->data['personal_urls'] )
== 0 ) echo ' emptyPortlet'; ?>">
+<div id="p-personal" class="<?php
+ if ( count( $this->data['personal_urls'] ) == 0 ) {
+ echo ' emptyPortlet';
+ } ?>">
<h5><?php $this->msg( 'personaltools' ) ?></h5>
<ul<?php $this->html( 'userlangattributes' ) ?>>
<?php foreach ( $this->getPersonalTools() as $key => $item ): ?>
diff --git a/composer.json b/composer.json
index 9e7543c..67d750e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "14.1.0",
+ "mediawiki/mediawiki-codesniffer": "15.0.0",
"mediawiki/minus-x": "0.2.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
--
To view, visit https://gerrit.wikimedia.org/r/400995
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6dcf52d28003087ff631cb69484280a29d2e327f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/skins/apex
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader <tools.libraryupgra...@tools.wmflabs.org>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
