[MediaWiki-commits] [Gerrit] mediawiki...apex[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

2018-01-03 Thread jenkins-bot (Code Review) 
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 @@
 


-   

-   

-   

-   
-   
-   
+   
+   
+   



diff --git a/ApexTemplate.php b/ApexTemplate.php
index 14f8b32..9c14d6c 100644
--- a/ApexTemplate.php
+++ b/ApexTemplate.php
@@ -212,7 +212,10 @@
}
?>
 >
-   >exists() ? $msgObj->text() : 
$msg ); ?>
+   >exists() ? $msgObj->text() : 
$msg );
+   ?>

 
@@ -260,7 +263,10 @@
switch ( $element ) {
case 'NAMESPACES':
 ?>
-
+
msg( 'namespaces' ) ?>
>
data['namespace_urls'] as $link ): ?>
@@ -272,7 +278,10 @@
break;
case 'VARIANTS':
 ?>
-
+

data['variant_urls'] as $link ): ?>

@@ -293,9 +302,10 @@
break;
case 'VIEWS':
 ?>
-
+
msg( 'views' ) ?>
>
data['view_urls'] as $link ): ?>
@@ -312,7 +322,10 @@
break;
case 'ACTIONS':
 ?>
-
+
msg( 'actions' ) ?>

>
@@ -326,7 +339,10 @@
break;
case 'PERSONAL':
 ?>
-
+
msg( 'personaltools' ) ?>
>
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 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...apex[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

2017-12-29 Thread Libraryupgrader (Code Review) 
Libraryupgrader has uploaded a new change for review. ( 
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, 15 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/apex 
refs/changes/95/400995/1

diff --git a/.phpcs.xml b/.phpcs.xml
index 6df021b..76de051 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,15 +2,12 @@
 


-   

-   

-   

-   
-   
-   
+   
+   
+   



diff --git a/ApexTemplate.php b/ApexTemplate.php
index 46a0a19..7c7b768 100644
--- a/ApexTemplate.php
+++ b/ApexTemplate.php
@@ -212,7 +212,8 @@
}
?>
 >
-   >exists() ? $msgObj->text() : 
$msg ); ?>
+   >exists() ? $msgObj->text() : $msg ); ?>

 
@@ -258,7 +259,8 @@
switch ( $element ) {
case 'NAMESPACES':
 ?>
-
+
msg( 'namespaces' ) ?>
>
data['namespace_urls'] as $link ): ?>
@@ -270,7 +272,8 @@
break;
case 'VARIANTS':
 ?>
-
+

data['variant_urls'] as $link ): ?>

@@ -293,7 +296,7 @@
 ?>
 
+   


   } ?>">
msg( 'views' ) ?>
>
data['view_urls'] as $link ): ?>
@@ -310,7 +313,8 @@
break;
case 'ACTIONS':
 ?>
-
+
msg( 'actions' ) ?>

>
@@ -324,7 +328,8 @@
break;
case 'PERSONAL':
 ?>
-
+
msg( 'personaltools' ) ?>
>
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: newchange
Gerrit-Change-Id: I6dcf52d28003087ff631cb69484280a29d2e327f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/apex
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits