jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/367171 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic
* MediaWiki.Commenting.FunctionComment.MissingParamTag
* MediaWiki.Commenting.FunctionComment.MissingReturn
* MediaWiki.Commenting.FunctionComment.ParamNameNoMatch
* MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName
The following sniffs now pass and were enabled:
* MediaWiki.Commenting.FunctionComment
* MediaWiki.NamingConventions.LowerCamelFunctionsName
Change-Id: I9501b1eccb1d64305a5a6f35b9df0416dc9d943f
---
M .gitignore
M ContributionTracking.processor.php
M composer.json
M phpcs.xml
4 files changed, 24 insertions(+), 20 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index e65c3c5..d6192df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
.*.swp
node_modules/
/vendor
+composer.lock
diff --git a/ContributionTracking.processor.php
b/ContributionTracking.processor.php
index b424877..92050af 100644
--- a/ContributionTracking.processor.php
+++ b/ContributionTracking.processor.php
@@ -49,15 +49,15 @@
* Saves a record of a new contribution to the
contribution_tracking_table
* @param array $params A staged array of parameters that can be
processed
* by the ContributionTrackingProcessor.
- * @return integer The id of the saved contribution in the
+ * @return int The id of the saved contribution in the
* contribution_tracking table
*/
static function saveNewContribution( $params = [] ) {
- $db =
ContributionTrackingProcessor::contributionTrackingConnection();
+ $db = self::contributionTrackingConnection();
$params['ts'] = $db->timestamp();
- $tracked_contribution =
ContributionTrackingProcessor::stage_contribution( $params );
+ $tracked_contribution = self::stage_contribution( $params );
$db->insert( 'contribution_tracking', $tracked_contribution );
$contribution_tracking_id = $db->insertId();
@@ -73,7 +73,7 @@
*/
static function stage_contribution( $params ) {
// change the posted names to match the db where necessary
- ContributionTrackingProcessor::rekey( $params, 'comment',
'note' );
+ self::rekey( $params, 'comment', 'note' );
if ( !array_key_exists( 'form_amount', $params ) ) {
if ( array_key_exists( 'currency_code', $params )
@@ -83,8 +83,8 @@
}
}
- $tracked_contribution =
ContributionTrackingProcessor::mergeArrayDefaults( $params,
-
ContributionTrackingProcessor::getContributionDefaults(), true );
+ $tracked_contribution = self::mergeArrayDefaults( $params,
+ self::getContributionDefaults(), true );
return $tracked_contribution;
}
@@ -97,26 +97,26 @@
static function stage_repost( $params ) {
// TODO: assert that gateway makes The Sense here.
// change the posted names to match the db where necessary
- ContributionTrackingProcessor::rekey( $params, 'amountGiven',
'amount_given' );
- ContributionTrackingProcessor::rekey( $params, 'returnto',
'return' );
+ self::rekey( $params, 'amountGiven', 'amount_given' );
+ self::rekey( $params, 'returnto', 'return' );
// booleanize!
- ContributionTrackingProcessor::stage_checkbox( $params,
'recurring_paypal' );
+ self::stage_checkbox( $params, 'recurring_paypal' );
// poke our language function with the current parameters -
// this sets the static var correctly
- $params['language'] =
ContributionTrackingProcessor::getLanguage( $params );
+ $params['language'] = self::getLanguage( $params );
if ( array_key_exists( 'recurring_paypal', $params ) &&
$params['recurring_paypal'] ) {
- $params['item_name'] =
ContributionTrackingProcessor::msg(
+ $params['item_name'] = self::msg(
'contrib-tracking-item-name-recurring' );
} else {
- $params['item_name'] =
ContributionTrackingProcessor::msg(
+ $params['item_name'] = self::msg(
'contrib-tracking-item-name-onetime' );
}
- $repost_params =
ContributionTrackingProcessor::mergeArrayDefaults( $params,
- ContributionTrackingProcessor::getRepostDefaults(),
true );
+ $repost_params = self::mergeArrayDefaults( $params,
+ self::getRepostDefaults(), true );
return $repost_params;
}
@@ -186,7 +186,7 @@
'premium_language' => false,
# FIXME: nonono!
'currency_code' => 'USD',
- 'return' => 'Donate-thanks/' .
ContributionTrackingProcessor::getLanguage(),
+ 'return' => 'Donate-thanks/' . self::getLanguage(),
'fname' => '',
'lname' => '',
'email' => '',
@@ -248,7 +248,7 @@
$wgContributionTrackingRPPLength;
// Set the action and tracking ID fields
- $input = ContributionTrackingProcessor::stage_repost( $input );
+ $input = self::stage_repost( $input );
$repost = [];
$repost['action'] = 'https://donate.wikimedia.org/';
@@ -407,6 +407,6 @@
*/
static function msg( $key ) {
return wfMessage( $key )
- ->inLanguage(
ContributionTrackingProcessor::getLanguage() )->escaped();
+ ->inLanguage( self::getLanguage() )->escaped();
}
}
diff --git a/composer.json b/composer.json
index 4f55859..bf202bf 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.0"
+ "mediawiki/mediawiki-codesniffer": "0.10.1"
},
"scripts": {
"fix": "phpcbf",
diff --git a/phpcs.xml b/phpcs.xml
index 95afc30..5bc70ff 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<ruleset>
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
- <exclude
name="MediaWiki.NamingConventions.LowerCamelFunctionsName"/>
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingReturn" />
+ <exclude
name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch" />
+ <exclude
name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" />
<exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment"/>
- <exclude name="MediaWiki.Commenting.FunctionComment"/>
</rule>
<file>.</file>
<arg name="extensions" value="php,php5,inc"/>
--
To view, visit https://gerrit.wikimedia.org/r/367171
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9501b1eccb1d64305a5a6f35b9df0416dc9d943f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContributionTracking
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
