jenkins-bot has submitted this change and it was merged.
Change subject: build: Configure phplint and phpcs
......................................................................
build: Configure phplint and phpcs
Change-Id: I3e1008407831da136551ccee6bbcdf17109cab49
---
M .gitignore
M IUserMergeLogger.php
M MergeUser.php
M SpecialUserMerge.php
A composer.json
5 files changed, 30 insertions(+), 7 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index e7e3181..0a78e72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
.*.swp
.idea
node_modules/
+composer.lock
+vendor/
diff --git a/IUserMergeLogger.php b/IUserMergeLogger.php
index f468b3e..da9febc 100644
--- a/IUserMergeLogger.php
+++ b/IUserMergeLogger.php
@@ -18,4 +18,4 @@
* @param User $oldUser
*/
public function addDeleteEntry( User $perfomer, User $oldUser );
-}
\ No newline at end of file
+}
diff --git a/MergeUser.php b/MergeUser.php
index 9f789b4..bd630c1 100755
--- a/MergeUser.php
+++ b/MergeUser.php
@@ -53,7 +53,7 @@
*
* @return array Array of failed page moves, see MergeUser::movePages
*/
- public function delete( User $performer, /* callable */ $msg ) {
+ public function delete( User $performer, /* callable */ $msg ) {
$failed = $this->movePages( $performer, $msg );
$this->deleteUser();
$this->logger->addDeleteEntry( $performer, $this->oldUser );
@@ -400,20 +400,26 @@
if ( $this->newUser->getName() === "Anonymous" ) { #
delete ALL old pages
if ( $oldPage->exists() ) {
$oldPageArticle = new Article(
$oldPage, 0 );
- $oldPageArticle->doDeleteArticle(
$message( 'usermerge-autopagedelete' )->inContentLanguage()->text() );
+ $oldPageArticle->doDeleteArticle(
+ $message(
'usermerge-autopagedelete' )->inContentLanguage()->text()
+ );
}
} elseif ( $newPage->exists()
&& !$oldPage->isValidMoveTarget( $newPage )
&& $newPage->getLength() > 0 ) { # delete old
pages that can't be moved
$oldPageArticle = new Article( $oldPage, 0 );
- $oldPageArticle->doDeleteArticle( $message(
'usermerge-autopagedelete' )->inContentLanguage()->text() );
+ $oldPageArticle->doDeleteArticle(
+ $message( 'usermerge-autopagedelete'
)->inContentLanguage()->text()
+ );
} else { # move content to new page
# delete target page if it exists and is blank
if ( $newPage->exists() ) {
$newPageArticle = new Article(
$newPage, 0 );
- $newPageArticle->doDeleteArticle(
$message( 'usermerge-autopagedelete' )->inContentLanguage()->text() );
+ $newPageArticle->doDeleteArticle(
+ $message(
'usermerge-autopagedelete' )->inContentLanguage()->text()
+ );
}
# move to target location
@@ -438,7 +444,9 @@
if ( !$dbr->numRows( $res ) ) {
# nothing links here, so delete unmoved
page/redirect
$oldPageArticle = new Article(
$oldPage, 0 );
- $oldPageArticle->doDeleteArticle(
$message( 'usermerge-autopagedelete' )->inContentLanguage()->text() );
+ $oldPageArticle->doDeleteArticle(
+ $message(
'usermerge-autopagedelete' )->inContentLanguage()->text()
+ );
}
}
}
diff --git a/SpecialUserMerge.php b/SpecialUserMerge.php
index 638bcab..6707fb1 100644
--- a/SpecialUserMerge.php
+++ b/SpecialUserMerge.php
@@ -169,4 +169,5 @@
* Former class name, for backwards compatability
* @deprecated
*/
-class UserMerge extends SpecialUserMerge {}
+class UserMerge extends SpecialUserMerge {
+}
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..a03d4b1
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,12 @@
+{
+ "require-dev": {
+ "jakub-onderka/php-parallel-lint": "0.9",
+ "mediawiki/mediawiki-codesniffer": "0.3.0"
+ },
+ "scripts": {
+ "test": [
+ "parallel-lint . --exclude vendor",
+ "phpcs
--standard=vendor/mediawiki/mediawiki-codesniffer/MediaWiki
--extensions=php,php5,inc --ignore=vendor,MassMessage.i18n.magic.php -p ."
+ ]
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/221350
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3e1008407831da136551ccee6bbcdf17109cab49
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UserMerge
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
