[MediaWiki-commits] [Gerrit] build: Configure phplint and phpcs - change (mediawiki...UserMerge)

2015-08-22 Thread jenkins-bot (Code Review) 
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 000..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: [
+

[MediaWiki-commits] [Gerrit] build: Configure phplint and phpcs - change (mediawiki...UserMerge)

2015-06-26 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/221350

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(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UserMerge 
refs/changes/50/221350/1

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 4a6141a..b72d00e 100644
--- a/MergeUser.php
+++ b/MergeUser.php
@@ -38,7 +38,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 );
@@ -378,20 +378,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
@@ -416,7 +422,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 000..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
+   },
+