Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/360160 )
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.MissingParamTag
* MediaWiki.Commenting.FunctionComment.ParamNameNoMatch
* MediaWiki.Commenting.FunctionComment.WrongStyle
* MediaWiki.FunctionComment.Missing.Public
* MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName
* MediaWiki.Usage.SuperGlobalsUsage.SuperGlobals
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment
Change-Id: Ie63bec8c64fc7ab457c6abe991f77b6461f16449
---
M AJAXPoll_body.php
M composer.json
M phpcs.xml
3 files changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AJAXPoll
refs/changes/60/360160/1
diff --git a/AJAXPoll_body.php b/AJAXPoll_body.php
index 749bace..46ea142 100644
--- a/AJAXPoll_body.php
+++ b/AJAXPoll_body.php
@@ -135,7 +135,6 @@
}
private static function buildStats( $id, $userName ) {
-
$dbr = wfGetDB( DB_SLAVE );
$dbr->begin( __METHOD__ );
@@ -210,7 +209,6 @@
$dbw->startAtomic( __METHOD__ );
if ( $answer != 0 ) {
-
$answer = ++$answer;
$q = $dbw->select(
@@ -225,7 +223,6 @@
$row = $dbw->fetchRow( $q );
if ( $row['count'] > 0 ) {
-
$updateQuery = $dbw->update(
'ajaxpoll_vote',
[
@@ -344,7 +341,6 @@
}
if ( is_object( $wgTitle ) ) {
-
if ( !empty( $extra_from_ajax ) ) {
$style = 'display:inline-block';
$ajaxMessage = wfMessage( $extra_from_ajax
)->escaped();
@@ -401,7 +397,6 @@
}
if ( !$wgUser->isAllowed( 'ajaxpoll-view-results' ) ) {
-
$message .= "<br/>" . wfMessage(
'ajaxpoll-view-results-permission' )->text();
} elseif ( !$userVoted
&& !$wgUser->isAllowed(
'ajaxpoll-view-results-before-vote' )
@@ -466,7 +461,6 @@
&& ( $showResultsBeforeVoting || (
!$showResultsBeforeVoting && $userVoted ) )
&& $vote
) {
-
$resultBar = Html::rawElement( 'div',
[
'class' =>
'ajaxpoll-answer-vote' . ( $isOurVote ? ' ajaxpoll-our-vote' : '' )
@@ -486,7 +480,6 @@
}
if ( $wgUser->isAllowed( 'ajaxpoll-vote' ) ) {
-
$ret .= Html::rawElement( 'div',
[
'id' =>
'ajaxpoll-answer-' . $xid,
@@ -593,7 +586,6 @@
$patchPath = __DIR__ . '/patches/';
if ( $db->tableExists( 'poll_info' ) ) {
-
# poll_info.poll_title field was dropped in
AJAXPoll version 1.72
$updater->dropExtensionField(
'poll_info',
@@ -621,7 +613,6 @@
}
if ( $db->tableExists( 'poll_vote' ) ) {
-
$updater->addExtensionTable(
'poll_vote',
$patchPath .
'rename-table--poll_vote.sql'
diff --git a/composer.json b/composer.json
index 3e676f3..858a1ef 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..a018091 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,8 +1,17 @@
<?xml version="1.0"?>
<ruleset>
- <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
+ <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
+ <exclude
name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch" />
+ <exclude name="MediaWiki.Commenting.FunctionComment.WrongStyle"
/>
+ <exclude name="MediaWiki.FunctionComment.Missing.Public" />
+ <exclude
name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" />
+ <exclude name="MediaWiki.Usage.SuperGlobalsUsage.SuperGlobals"
/>
+ <exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
+ </rule>
<file>.</file>
- <arg name="extensions" value="php,php5,inc"/>
- <arg name="encoding" value="utf8"/>
+ <arg name="extensions" value="php,php5,inc" />
+ <arg name="encoding" value="utf8" />
<exclude-pattern>vendor</exclude-pattern>
</ruleset>
--
To view, visit https://gerrit.wikimedia.org/r/360160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie63bec8c64fc7ab457c6abe991f77b6461f16449
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AJAXPoll
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
