[MediaWiki-commits] [Gerrit] mediawiki...CiteThisPage[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-20 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/360129 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.MissingParamComment
* MediaWiki.Commenting.FunctionComment.MissingParamName
* MediaWiki.Commenting.FunctionComment.MissingParamTag
* MediaWiki.Commenting.FunctionComment.ParamNameNoMatch
* MediaWiki.FunctionComment.Missing.Protected
* MediaWiki.FunctionComment.Missing.Public
* MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName

Change-Id: I45ddf6c4adfd3ac81c1da5b3159f1af267b2dad8
---
M SpecialCiteThisPage.php
M composer.json
M phpcs.xml
3 files changed, 13 insertions(+), 7 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/SpecialCiteThisPage.php b/SpecialCiteThisPage.php
index ada2f3b..819635b 100644
--- a/SpecialCiteThisPage.php
+++ b/SpecialCiteThisPage.php
@@ -118,7 +118,6 @@
 
$this->getOutput()->addModuleStyles( 'ext.citeThisPage' );
$this->getOutput()->addParserOutputContent( $ret );
-
}
 
/**
@@ -146,7 +145,7 @@
$code = $wgContLang->lc( $wgContLanguageCode );
if ( file_exists( "${dir}citethispage-content-$code" ) 
) {
$msg = file_get_contents( 
"${dir}citethispage-content-$code" );
-   } elseif ( file_exists( "${dir}citethispage-content" ) 
){
+   } elseif ( file_exists( "${dir}citethispage-content" ) 
) {
$msg = file_get_contents( 
"${dir}citethispage-content" );
}
}
@@ -193,7 +192,6 @@
);
 
return $ret->getText();
-
}
 
protected function getDisplayFormat() {
diff --git a/composer.json b/composer.json
index eb11804..bb4730c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.7.2",
+   "mediawiki/mediawiki-codesniffer": "0.9.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/phpcs.xml b/phpcs.xml
index d81a292..810c188 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,8 +1,16 @@
 
 
-   
+   
+   
+   
+   
+   
+   
+   
+   
+   
.
-   
-   
+   
+   
vendor
 

-- 
To view, visit https://gerrit.wikimedia.org/r/360129
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I45ddf6c4adfd3ac81c1da5b3159f1af267b2dad8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CiteThisPage
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jforrester 
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...CiteThisPage[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-19 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/360129 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.MissingParamComment
* MediaWiki.Commenting.FunctionComment.MissingParamName
* MediaWiki.Commenting.FunctionComment.MissingParamTag
* MediaWiki.Commenting.FunctionComment.ParamNameNoMatch
* MediaWiki.FunctionComment.Missing.Protected
* MediaWiki.FunctionComment.Missing.Public
* MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName

Change-Id: I45ddf6c4adfd3ac81c1da5b3159f1af267b2dad8
---
M SpecialCiteThisPage.php
M composer.json
M phpcs.xml
3 files changed, 13 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CiteThisPage 
refs/changes/29/360129/1

diff --git a/SpecialCiteThisPage.php b/SpecialCiteThisPage.php
index ada2f3b..819635b 100644
--- a/SpecialCiteThisPage.php
+++ b/SpecialCiteThisPage.php
@@ -118,7 +118,6 @@
 
$this->getOutput()->addModuleStyles( 'ext.citeThisPage' );
$this->getOutput()->addParserOutputContent( $ret );
-
}
 
/**
@@ -146,7 +145,7 @@
$code = $wgContLang->lc( $wgContLanguageCode );
if ( file_exists( "${dir}citethispage-content-$code" ) 
) {
$msg = file_get_contents( 
"${dir}citethispage-content-$code" );
-   } elseif ( file_exists( "${dir}citethispage-content" ) 
){
+   } elseif ( file_exists( "${dir}citethispage-content" ) 
) {
$msg = file_get_contents( 
"${dir}citethispage-content" );
}
}
@@ -193,7 +192,6 @@
);
 
return $ret->getText();
-
}
 
protected function getDisplayFormat() {
diff --git a/composer.json b/composer.json
index eb11804..bb4730c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.7.2",
+   "mediawiki/mediawiki-codesniffer": "0.9.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/phpcs.xml b/phpcs.xml
index d81a292..810c188 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,8 +1,16 @@
 
 
-   
+   
+   
+   
+   
+   
+   
+   
+   
+   
.
-   
-   
+   
+   
vendor
 

-- 
To view, visit https://gerrit.wikimedia.org/r/360129
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45ddf6c4adfd3ac81c1da5b3159f1af267b2dad8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CiteThisPage
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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