jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/360280 )
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.MissingParamName
* MediaWiki.Commenting.FunctionComment.MissingParamTag
* MediaWiki.FunctionComment.Missing.Protected
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment
Change-Id: Iadc76d4ccc8051c6d3db35b2abb0e6ae60b2f75a
---
M MergeUser.php
M SpecialUserMerge.php
M composer.json
M phpcs.xml
4 files changed, 20 insertions(+), 14 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MergeUser.php b/MergeUser.php
index 3ba7c5e..2e525c2 100755
--- a/MergeUser.php
+++ b/MergeUser.php
@@ -204,10 +204,10 @@
*/
private function mergeDatabaseTables( $fnameTrxOwner ) {
// Fields to update with the format:
- // array(
- // tableName, idField, textField,
- // 'batchKey' => unique field, 'options' => array(),
'db' => DatabaseBase
- // );
+ // [
+ // tableName, idField, textField,
+ // 'batchKey' => unique field, 'options' => array(), 'db' =>
DatabaseBase
+ // ];
// textField, batchKey, db, and options are optional
$updateFields = [
[ 'archive', 'ar_user', 'ar_user_text', 'batchKey' =>
'ar_id' ],
@@ -395,7 +395,7 @@
]
);
- $message = function( /* ... */ ) use ( $msg ) {
+ $message = function ( /* ... */ ) use ( $msg ) {
return call_user_func_array( $msg, func_get_args() );
};
@@ -405,7 +405,6 @@
$failedMoves = [];
foreach ( $pages as $row ) {
-
$oldPage = Title::makeTitleSafe( $row->page_namespace,
$row->page_title );
$newPage = Title::makeTitleSafe( $row->page_namespace,
preg_replace( '!^[^/]+!',
$newusername->getDBkey(), $row->page_title ) );
@@ -419,8 +418,9 @@
}
} elseif ( $newPage->exists()
&& !$oldPage->isValidMoveTarget( $newPage )
- && $newPage->getLength() > 0 ) { # delete old
pages that can't be moved
-
+ && $newPage->getLength() > 0
+ ) {
+ # delete old pages that can't be moved
$oldPageArticle = new Article( $oldPage, 0 );
$oldPageArticle->doDeleteArticle(
$message( 'usermerge-autopagedelete'
)->inContentLanguage()->text()
diff --git a/SpecialUserMerge.php b/SpecialUserMerge.php
index 525b863..ab38df4 100644
--- a/SpecialUserMerge.php
+++ b/SpecialUserMerge.php
@@ -32,7 +32,7 @@
'type' => 'text',
'label-message' => 'usermerge-olduser',
'required' => true,
- 'validation-callback' => function( $val ) use (
$us ) {
+ 'validation-callback' => function ( $val ) use
( $us ) {
// only pass strings to
User::newFromName
if ( !is_string( $val ) ) {
return true;
@@ -49,7 +49,7 @@
'type' => 'text',
'required' => true,
'label-message' => 'usermerge-newuser',
- 'validation-callback' => function( $val ) use (
$us ) {
+ 'validation-callback' => function ( $val ) use
( $us ) {
// only pass strings to
User::newFromName
if ( !is_string( $val ) ) {
return true;
diff --git a/composer.json b/composer.json
index 664b9b4..7a306bc 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 b3c8bce..d730d3d 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,11 +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.MissingParamName" />
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
+ <exclude name="MediaWiki.FunctionComment.Missing.Protected" />
+ <exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
+ </rule>
<rule ref="Generic.Files.LineLength">
<exclude-pattern>UserMerge.alias.php</exclude-pattern>
</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="UTF-8" />
<exclude-pattern>vendor</exclude-pattern>
</ruleset>
--
To view, visit https://gerrit.wikimedia.org/r/360280
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iadc76d4ccc8051c6d3db35b2abb0e6ae60b2f75a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/UserMerge
Gerrit-Branch: master
Gerrit-Owner: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
