jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/358093 )
Change subject: Handle simply newlines
......................................................................
Handle simply newlines
Remove multiple empty lines and add some lines to functions
Prepare to make phpcs pass
Change-Id: Idc63e169b2e9203baaa2d2df14f8f4b2f463793c
---
M includes/CentralAuthPlugin.php
M includes/CentralAuthUser.php
M includes/EmailableUser.php
M includes/WikiSet.php
M includes/specials/SpecialCentralAutoLogin.php
M includes/specials/SpecialGlobalGroupPermissions.php
M includes/specials/SpecialGlobalRenameQueue.php
M includes/specials/SpecialWikiSets.php
M maintenance/migrateAccount.php
M tests/phpunit/CentralAuthHooksUsingDatabaseTest.php
M tests/phpunit/CentralAuthPluginUsingDatabaseTest.php
M tests/phpunit/CentralAuthPreAuthManagerHooksUsingDatabaseTest.php
12 files changed, 26 insertions(+), 21 deletions(-)
Approvals:
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, approved
diff --git a/includes/CentralAuthPlugin.php b/includes/CentralAuthPlugin.php
index d531601..e984a6d 100644
--- a/includes/CentralAuthPlugin.php
+++ b/includes/CentralAuthPlugin.php
@@ -157,7 +157,6 @@
return true;
}
-
/**
* Check the user's password.
*
@@ -224,7 +223,6 @@
}
return true;
}
-
/**
* Return true if the wiki should create a new local account
automatically
diff --git a/includes/CentralAuthUser.php b/includes/CentralAuthUser.php
index 66717e7..690cd23 100644
--- a/includes/CentralAuthUser.php
+++ b/includes/CentralAuthUser.php
@@ -2561,7 +2561,6 @@
__METHOD__ . " was called for a global user
that doesn't exist ('$this->mName')." );
}
-
if ( $resetAuthToken ) {
$this->resetAuthToken();
}
diff --git a/includes/EmailableUser.php b/includes/EmailableUser.php
index f568566..3dca870 100644
--- a/includes/EmailableUser.php
+++ b/includes/EmailableUser.php
@@ -69,7 +69,6 @@
$mergeAccountUrl = $this->getTokenUrl( 'MergeAccount',
$token );
}
-
$invalidateURL = $this->invalidationTokenUrl( $token );
$this->saveSettings();
diff --git a/includes/WikiSet.php b/includes/WikiSet.php
index 8ed4b94..0dd32e7 100755
--- a/includes/WikiSet.php
+++ b/includes/WikiSet.php
@@ -38,42 +38,58 @@
* @param $k string
* @return string
*/
- protected static function memcKey( $k ) { return "wikiset:{$k}"; }
+ protected static function memcKey( $k ) {
+ return "wikiset:{$k}";
+ }
/**
* @return int
*/
- public function getId() { return $this->mId; }
+ public function getId() {
+ return $this->mId;
+ }
/**
* @return bool
*/
- public function exists() { return (bool)$this->getID(); }
+ public function exists() {
+ return (bool)$this->getID();
+ }
/**
* @return string
*/
- public function getName() { return $this->mName; }
+ public function getName() {
+ return $this->mName;
+ }
/**
* @param string $n
*/
- public function setName( $n ) { $this->setDbField( 'ws_name', $n ); }
+ public function setName( $n ) {
+ $this->setDbField( 'ws_name', $n );
+ }
/**
* @return array
*/
- public function getWikisRaw() { return $this->mWikis; }
+ public function getWikisRaw() {
+ return $this->mWikis;
+ }
/**
* @param string $w
*/
- public function setWikisRaw( $w ) { $this->setDbField( 'ws_wikis', $w
); }
+ public function setWikisRaw( $w ) {
+ $this->setDbField( 'ws_wikis', $w );
+ }
/**
* @return string
*/
- public function getType() { return $this->mType; }
+ public function getType() {
+ return $this->mType;
+ }
/**
* @param string $t
diff --git a/includes/specials/SpecialCentralAutoLogin.php
b/includes/specials/SpecialCentralAutoLogin.php
index 57ff39e..1a854f5 100644
--- a/includes/specials/SpecialCentralAutoLogin.php
+++ b/includes/specials/SpecialCentralAutoLogin.php
@@ -310,7 +310,6 @@
return;
}
-
if ( $gu_id <= 0 ) {
$this->doFinalOutput( false, 'Not centrally
logged in', self::getInlineScript( 'anon-set.js' ) );
return;
diff --git a/includes/specials/SpecialGlobalGroupPermissions.php
b/includes/specials/SpecialGlobalGroupPermissions.php
index 56ea2ca..0ed6bce 100644
--- a/includes/specials/SpecialGlobalGroupPermissions.php
+++ b/includes/specials/SpecialGlobalGroupPermissions.php
@@ -323,7 +323,6 @@
$assignedRights = $this->getAssignedRights( $group );
-
$checkboxes = array();
$attribs = array();
diff --git a/includes/specials/SpecialGlobalRenameQueue.php
b/includes/specials/SpecialGlobalRenameQueue.php
index c67d64d..d09e668 100644
--- a/includes/specials/SpecialGlobalRenameQueue.php
+++ b/includes/specials/SpecialGlobalRenameQueue.php
@@ -679,7 +679,6 @@
}
}
-
/**
* Paginated table of search results.
* @ingroup Pager
diff --git a/includes/specials/SpecialWikiSets.php
b/includes/specials/SpecialWikiSets.php
index 72d102b..40f30d6 100644
--- a/includes/specials/SpecialWikiSets.php
+++ b/includes/specials/SpecialWikiSets.php
@@ -340,7 +340,8 @@
$oldwikis = $set->getWikisRaw();
} else {
$set = new WikiSet();
- $oldname = $oldtype = null; $oldwikis = array();
+ $oldname = $oldtype = null;
+ $oldwikis = array();
}
$set->setName( $name );
$set->setType( $type );
diff --git a/maintenance/migrateAccount.php b/maintenance/migrateAccount.php
index 3afe58d..6c0e396 100644
--- a/maintenance/migrateAccount.php
+++ b/maintenance/migrateAccount.php
@@ -111,7 +111,6 @@
return;
}
-
/**
* Migration with an existing global account
*/
diff --git a/tests/phpunit/CentralAuthHooksUsingDatabaseTest.php
b/tests/phpunit/CentralAuthHooksUsingDatabaseTest.php
index f0a74f1..dd9bad8 100644
--- a/tests/phpunit/CentralAuthHooksUsingDatabaseTest.php
+++ b/tests/phpunit/CentralAuthHooksUsingDatabaseTest.php
@@ -51,5 +51,4 @@
$u->save( $this->db );
}
-
}
diff --git a/tests/phpunit/CentralAuthPluginUsingDatabaseTest.php
b/tests/phpunit/CentralAuthPluginUsingDatabaseTest.php
index aaefccf..4efd245 100644
--- a/tests/phpunit/CentralAuthPluginUsingDatabaseTest.php
+++ b/tests/phpunit/CentralAuthPluginUsingDatabaseTest.php
@@ -98,7 +98,6 @@
$u->save( $this->db );
}
-
/**
* @dataProvider provideUserExists
* @covers CentralAuthPlugin::userExists
diff --git a/tests/phpunit/CentralAuthPreAuthManagerHooksUsingDatabaseTest.php
b/tests/phpunit/CentralAuthPreAuthManagerHooksUsingDatabaseTest.php
index 2fc2cca..f8404a1 100644
--- a/tests/phpunit/CentralAuthPreAuthManagerHooksUsingDatabaseTest.php
+++ b/tests/phpunit/CentralAuthPreAuthManagerHooksUsingDatabaseTest.php
@@ -8,7 +8,6 @@
*/
class CentralAuthPreAuthManagerHooksUsingDatabaseTest extends
CentralAuthTestCaseUsingDatabase {
-
/**
* @dataProvider provideAbortNewAccount
* @covers CentralAuthPreAuthManagerHooks::onAbortNewAccount
@@ -91,6 +90,5 @@
);
$u->save( $this->db );
}
-
}
--
To view, visit https://gerrit.wikimedia.org/r/358093
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idc63e169b2e9203baaa2d2df14f8f4b2f463793c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
