jenkins-bot has submitted this change and it was merged.
Change subject: codesniffer to 0.5.1, grunt-jsonlint to 1.0.7
......................................................................
codesniffer to 0.5.1, grunt-jsonlint to 1.0.7
Change-Id: I010e63d84702d30adb51b5c019b85efe8ae9c08a
---
M composer.json
M ffs/MediaWikiComplexMessages.php
M package.json
M scripts/translator-stats-process.php
M specials/SpecialSupportedLanguages.php
M tests/phpunit/HookDocTest.php
6 files changed, 18 insertions(+), 7 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index e2ee904..8be462f 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9",
- "mediawiki/mediawiki-codesniffer": "0.4.0"
+ "mediawiki/mediawiki-codesniffer": "0.5.1"
},
"suggest": {
"mediawiki/babel": "Users can easily indicate their language
proficiency on their user page",
diff --git a/ffs/MediaWikiComplexMessages.php b/ffs/MediaWikiComplexMessages.php
index cd03e2f..2be2a19 100644
--- a/ffs/MediaWikiComplexMessages.php
+++ b/ffs/MediaWikiComplexMessages.php
@@ -77,10 +77,11 @@
continue;
}
- foreach ( $values as $index => $value )
+ foreach ( $values as $index => $value ) {
if ( in_array( $value, $defs[$item], true ) ) {
unset( $current[$item][$index] );
}
+ }
}
return $current;
@@ -471,7 +472,9 @@
$text = '';
$errors = array();
$this->validate( $errors, $filter );
- foreach ( $errors as $_ ) $text .= "#!!# $_\n";
+ foreach ( $errors as $_ ) {
+ $text .= "#!!# $_\n";
+ }
foreach ( $this->getGroups() as $group => $data ) {
if ( $filter !== false && !in_array( $group,
(array)$filter, true ) ) {
diff --git a/package.json b/package.json
index aa347fe..7b70396 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,6 @@
"grunt-cli": "0.1.13",
"grunt-contrib-jshint": "0.11.3",
"grunt-jscs": "2.5.0",
- "grunt-jsonlint": "1.0.6"
+ "grunt-jsonlint": "1.0.7"
}
}
diff --git a/scripts/translator-stats-process.php
b/scripts/translator-stats-process.php
index 042039f..df6497d 100644
--- a/scripts/translator-stats-process.php
+++ b/scripts/translator-stats-process.php
@@ -47,7 +47,12 @@
fgets( $handle );
$data = array();
- while ( ( $l = fgets( $handle ) ) !== false ) {
+ while ( true ) {
+ $l = fgets( $handle );
+ if ( $l === false ) {
+ break;
+ }
+
$fields = explode( "\t", trim( $l, "\n" ) );
list( $name, $reg, $edits, $translator, $promoted,
$method ) = $fields;
$month = substr( $reg, 0, 4 ) . '-' . substr( $reg, 4,
2 ) . '-01';
diff --git a/specials/SpecialSupportedLanguages.php
b/specials/SpecialSupportedLanguages.php
index c05f4af..6da2c8f 100644
--- a/specials/SpecialSupportedLanguages.php
+++ b/specials/SpecialSupportedLanguages.php
@@ -420,8 +420,9 @@
$keys = array_keys( $list );
shuffle( $keys );
$random = array();
- foreach ( $keys as $key )
+ foreach ( $keys as $key ) {
$random[$key] = $list[$key];
+ }
return $random;
}
diff --git a/tests/phpunit/HookDocTest.php b/tests/phpunit/HookDocTest.php
index f6bc77c..2a343ae 100644
--- a/tests/phpunit/HookDocTest.php
+++ b/tests/phpunit/HookDocTest.php
@@ -98,10 +98,12 @@
$hooks = array();
$dh = opendir( $path );
if ( $dh ) {
- while ( ( $file = readdir( $dh ) ) !== false ) {
+ $file = readdir( $dh );
+ while ( $file !== false ) {
if ( filetype( $path . $file ) == 'file' ) {
$hooks = array_merge( $hooks,
call_user_func( $callback, $path . $file ) );
}
+ $file = readdir( $dh );
}
closedir( $dh );
}
--
To view, visit https://gerrit.wikimedia.org/r/261327
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I010e63d84702d30adb51b5c019b85efe8ae9c08a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
