[MediaWiki-commits] [Gerrit] Update mediawiki-codesniffer and parallel-lint settings - change (mediawiki...Interwiki)

2015-09-29 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Update mediawiki-codesniffer and parallel-lint settings
..


Update mediawiki-codesniffer and parallel-lint settings

Change-Id: I6da9471df6448ab02aa6cc49cd85705a5f7014a1
---
M composer.json
M phpcs.xml
2 files changed, 4 insertions(+), 3 deletions(-)

Approvals:
  Paladox: Looks good to me, but someone else must approve
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index 969895a..4365e8a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,12 +1,12 @@
 {
"require-dev": {
-   "jakub-onderka/php-parallel-lint": "0.9.*",
+   "jakub-onderka/php-parallel-lint": "0.9",
"mediawiki/mediawiki-codesniffer": "0.4.0"
},
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
-   "phpcs -p"
+   "phpcs -p -s"
]
}
 }
diff --git a/phpcs.xml b/phpcs.xml
index cb19440..d81a292 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -2,6 +2,7 @@
 

.
-   
+   
+   
vendor
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6da9471df6448ab02aa6cc49cd85705a5f7014a1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Interwiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update mediawiki-codesniffer and parallel-lint settings - change (mediawiki...Interwiki)

2015-09-28 Thread Siebrand (Code Review) 
Siebrand has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/241983

Change subject: Update mediawiki-codesniffer and parallel-lint settings
..

Update mediawiki-codesniffer and parallel-lint settings

Change-Id: I6da9471df6448ab02aa6cc49cd85705a5f7014a1
---
M Interwiki_body.php
M composer.json
A phpcs.xml
3 files changed, 13 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Interwiki 
refs/changes/83/241983/1

diff --git a/Interwiki_body.php b/Interwiki_body.php
index 66e631f..c52907b 100644
--- a/Interwiki_body.php
+++ b/Interwiki_body.php
@@ -357,7 +357,7 @@
$this->getOutput()->addWikiMsg( 'interwiki-legend' );
 
if ( !is_array( $iwPrefixes ) || count( $iwPrefixes ) === 0 ) {
-   if (  !is_array( $iwGlobalPrefixes ) || count( 
$iwGlobalPrefixes ) === 0 ) {
+   if ( !is_array( $iwGlobalPrefixes ) || count( 
$iwGlobalPrefixes ) === 0 ) {
// If the interwiki table(s) are empty, display 
an error message
$this->error( 'interwiki_error' );
return;
diff --git a/composer.json b/composer.json
index 7e86f90..df3824f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,12 @@
 {
"require-dev": {
-   "jakub-onderka/php-parallel-lint": "0.9.*"
+   "jakub-onderka/php-parallel-lint": "0.9",
+   "mediawiki/mediawiki-codesniffer": "0.4.0"
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor"
+   "parallel-lint . --exclude vendor",
+   "phpcs -p"
]
}
-
 }
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 000..d81a292
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,8 @@
+
+
+   
+   .
+   
+   
+   vendor
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6da9471df6448ab02aa6cc49cd85705a5f7014a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Interwiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand 
Gerrit-Reviewer: Paladox 

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