jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/371391 )

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


build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

Change-Id: Ie69def65186446d7dd8d456375731630664afac2
---
M cli/purgePrivateVoteData.php
M composer.json
M includes/ballots/PreferentialBallot.php
M includes/pages/VoterEligibilityPage.php
M includes/talliers/PluralityTallier.php
M includes/talliers/Tallier.php
M includes/user/Voter.php
7 files changed, 10 insertions(+), 10 deletions(-)

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



diff --git a/cli/purgePrivateVoteData.php b/cli/purgePrivateVoteData.php
index 96d5432..1db436c 100644
--- a/cli/purgePrivateVoteData.php
+++ b/cli/purgePrivateVoteData.php
@@ -103,7 +103,7 @@
                        $dbw = wfGetDB( DB_MASTER );
 
                        foreach ( $deleteSets as $deleteSet ) {
-                               list ( $minId, $maxId ) = $deleteSet;
+                               list( $minId, $maxId ) = $deleteSet;
                                $dbw->update(
                                        'securepoll_votes',
                                        [ 'vote_ip' => '', 'vote_xff' => '', 
'vote_ua' => '' ],
diff --git a/composer.json b/composer.json
index fd295f4..96a1043 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
        "require-dev": {
                "jakub-onderka/php-parallel-lint": "0.9.2",
                "jakub-onderka/php-console-highlighter": "0.3.2",
-               "mediawiki/mediawiki-codesniffer": "0.10.1"
+               "mediawiki/mediawiki-codesniffer": "0.11.0"
        },
        "scripts": {
                "fix": "phpcbf",
diff --git a/includes/ballots/PreferentialBallot.php 
b/includes/ballots/PreferentialBallot.php
index 2c62b08..7222b0b 100644
--- a/includes/ballots/PreferentialBallot.php
+++ b/includes/ballots/PreferentialBallot.php
@@ -100,7 +100,7 @@
 
        function unpackRecord( $record ) {
                $ranks = [];
-               $itemLength = 3*8 + 7;
+               $itemLength = 3 * 8 + 7;
                for ( $offset = 0, $len = strlen( $record ); $offset < $len; 
$offset += $itemLength ) {
                        if ( !preg_match( 
'/Q([0-9A-F]{8})-A([0-9A-F]{8})-R([0-9A-F]{8})--/A',
                                $record, $m, 0, $offset )
diff --git a/includes/pages/VoterEligibilityPage.php 
b/includes/pages/VoterEligibilityPage.php
index 322552e..3b6c0e7 100644
--- a/includes/pages/VoterEligibilityPage.php
+++ b/includes/pages/VoterEligibilityPage.php
@@ -227,7 +227,7 @@
                        if ( $i === false ) {
                                $wiki = '*';
                        } else {
-                               $wiki = trim( substr( $name, $i+1 ) );
+                               $wiki = trim( substr( $name, $i + 1 ) );
                                $name = trim( substr( $name, 0, $i ) );
                        }
                        if ( $wiki !== '' && $name !== '' ) {
diff --git a/includes/talliers/PluralityTallier.php 
b/includes/talliers/PluralityTallier.php
index 131ed88..e90bfe6 100644
--- a/includes/talliers/PluralityTallier.php
+++ b/includes/talliers/PluralityTallier.php
@@ -85,7 +85,7 @@
                $oids = array_keys( $this->tally );
                $scores = array_values( $this->tally );
                foreach ( $oids as $i => $oid ) {
-                       if ( $i > 0 && $scores[$i-1] !== $scores[$i] ) {
+                       if ( $i > 0 && $scores[$i - 1] !== $scores[$i] ) {
                                $currentRank = $i + 1;
                        }
                        $ranks[$oid] = $currentRank;
diff --git a/includes/talliers/Tallier.php b/includes/talliers/Tallier.php
index 4503597..e046896 100644
--- a/includes/talliers/Tallier.php
+++ b/includes/talliers/Tallier.php
@@ -80,8 +80,8 @@
                $ids = array_keys( $ranks );
                foreach ( $ids as $i => $oid ) {
                        $rank = $ranks[$oid];
-                       $prevRank = isset( $ids[$i-1] ) ? $ranks[$ids[$i-1]] : 
false;
-                       $nextRank = isset( $ids[$i+1] ) ? $ranks[$ids[$i+1]] : 
false;
+                       $prevRank = isset( $ids[$i - 1] ) ? $ranks[$ids[$i - 
1]] : false;
+                       $nextRank = isset( $ids[$i + 1] ) ? $ranks[$ids[$i + 
1]] : false;
                        if ( $rank === $prevRank || $rank === $nextRank ) {
                                $rank .= '*';
                        }
@@ -112,8 +112,8 @@
 
                foreach ( $ids as $i => $oid ) {
                        $rank = $ranks[$oid];
-                       $prevRank = isset( $ids[$i-1] ) ? $ranks[$ids[$i-1]] : 
false;
-                       $nextRank = isset( $ids[$i+1] ) ? $ranks[$ids[$i+1]] : 
false;
+                       $prevRank = isset( $ids[$i - 1] ) ? $ranks[$ids[$i - 
1]] : false;
+                       $nextRank = isset( $ids[$i + 1] ) ? $ranks[$ids[$i + 
1]] : false;
                        if ( $rank === $prevRank || $rank === $nextRank ) {
                                $rank .= '*';
                        }
diff --git a/includes/user/Voter.php b/includes/user/Voter.php
index d3cf09d..26a099b 100644
--- a/includes/user/Voter.php
+++ b/includes/user/Voter.php
@@ -173,7 +173,7 @@
                                }
                        }
                } else {
-                       setcookie( $cookieName, $this->getId(), time() + 
86400*30 );
+                       setcookie( $cookieName, $this->getId(), time() + 86400 
* 30 );
                }
        }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie69def65186446d7dd8d456375731630664afac2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to