Libraryupgrader has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/400919 )
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:
* Generic.Files.OneObjectStructurePerFile.MultipleFound
* Squiz.Scope.MethodScope.Missing
The following sniffs now pass and were enabled:
* MediaWiki.Files.ClassMatchesFilename.WrongCase
* MediaWiki.Files.OneClassPerFile.MultipleFound
Change-Id: I9574f3ac621dc70f7b7541bebd2a7aba960faf96
---
M .phpcs.xml
M composer.json
M includes/ballots/Ballot.php
M includes/talliers/SchulzeTallier.php
4 files changed, 6 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecurePoll
refs/changes/19/400919/1
diff --git a/.phpcs.xml b/.phpcs.xml
index d4ef4b3..db1a56d 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<ruleset>
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+ <exclude
name="Generic.Files.OneObjectStructurePerFile.MultipleFound" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
<exclude name="MediaWiki.Commenting.FunctionComment.WrongStyle"
/>
<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
- <exclude name="MediaWiki.Files.ClassMatchesFilename.WrongCase"
/>
- <exclude name="MediaWiki.Files.OneClassPerFile.MultipleFound" />
- <exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
+ <exclude name="Squiz.Classes.ValidClassName.NotCamelCaps" />
+ <exclude name="Squiz.Scope.MethodScope.Missing" />
<exclude
name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" />
<exclude
name="MediaWiki.VariableAnalysis.ForbiddenGlobalVariables.ForbiddenGlobal$wgTitle"
/>
<exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment"/>
diff --git a/composer.json b/composer.json
index a74cd2c..528b9a9 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": "14.1.0",
+ "mediawiki/mediawiki-codesniffer": "15.0.0",
"mediawiki/minus-x": "0.2.1"
},
"scripts": {
diff --git a/includes/ballots/Ballot.php b/includes/ballots/Ballot.php
index ff82787..a9d5951 100644
--- a/includes/ballots/Ballot.php
+++ b/includes/ballots/Ballot.php
@@ -205,8 +205,7 @@
return '';
}
$this->usedErrorIds[$id] = true;
- return
- Xml::element( 'img', [
+ return Xml::element( 'img', [
'src' => $this->context->getResourceUrl(
'warning-22.png' ),
'width' => 22,
'height' => 22,
diff --git a/includes/talliers/SchulzeTallier.php
b/includes/talliers/SchulzeTallier.php
index 28c96ab..b1a7962 100644
--- a/includes/talliers/SchulzeTallier.php
+++ b/includes/talliers/SchulzeTallier.php
@@ -149,8 +149,7 @@
function getTextResult() {
$rankedIds = array_keys( $this->ranks );
- return
- wfMessage( 'securepoll-ranks' )->text() . "\n" .
+ return wfMessage( 'securepoll-ranks' )->text() . "\n" .
$this->convertRanksToText( $this->ranks ) . "\n\n" .
wfMessage( 'securepoll-pairwise-victories' )->text().
"\n" .
$this->convertMatrixToText( $this->victories,
$rankedIds ) . "\n\n" .
--
To view, visit https://gerrit.wikimedia.org/r/400919
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9574f3ac621dc70f7b7541bebd2a7aba960faf96
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader <tools.libraryupgra...@tools.wmflabs.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
