jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/380114 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 13.0.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 13.0.0
Change-Id: I3d46a58426b09cb442a502e3353c4fd9b5ce924b
---
M backend/ConfirmAccount.class.php
M backend/UserAccountRequest.php
M business/AccountConfirmSubmission.php
M composer.json
M frontend/specialpages/actions/UserCredentials_body.php
5 files changed, 7 insertions(+), 9 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/backend/ConfirmAccount.class.php b/backend/ConfirmAccount.class.php
index 07bc752..8ca46ee 100644
--- a/backend/ConfirmAccount.class.php
+++ b/backend/ConfirmAccount.class.php
@@ -129,7 +129,7 @@
* @return string|false
*/
public static function requestNameFromEmailToken( $code ) {
- $dbr = wfGetDB( DB_SLAVE );
+ $dbr = wfGetDB( DB_REPLICA );
return $dbr->selectField( 'account_requests',
'acr_name',
[
@@ -145,7 +145,7 @@
* @return Array Assosiative array with 'open', 'held', 'type' keys
mapping to integers
*/
public static function getOpenRequestCount( $type ) {
- $dbr = wfGetDB( DB_SLAVE );
+ $dbr = wfGetDB( DB_REPLICA );
$open = (int)$dbr->selectField( 'account_requests', 'COUNT(*)',
[ 'acr_type' => $type, 'acr_deleted' => 0, 'acr_held IS
NULL' ],
__METHOD__
@@ -314,7 +314,7 @@
if ( !count( $groups ) ) {
return UserArray::newFromResult( new FakeResultWrapper(
[] ) );
}
- $dbr = wfGetDB( DB_SLAVE );
+ $dbr = wfGetDB( DB_REPLICA );
return UserArray::newFromResult( $dbr->select(
[ 'user' ],
[ '*' ],
diff --git a/backend/UserAccountRequest.php b/backend/UserAccountRequest.php
index e2b8313..e24da51 100644
--- a/backend/UserAccountRequest.php
+++ b/backend/UserAccountRequest.php
@@ -128,7 +128,7 @@
public static function newFromId( $id, $from = null ) {
$db = ( $from == 'dbmaster' )
? wfGetDB( DB_MASTER )
- : wfGetDB( DB_SLAVE );
+ : wfGetDB( DB_REPLICA );
$row = $db->selectRow( 'account_requests', '*', [ 'acr_id' =>
$id ], __METHOD__ );
if ( !$row ) {
return null;
@@ -144,7 +144,7 @@
public static function newFromName( $name, $from = null ) {
$db = ( $master == 'dbmaster' )
? wfGetDB( DB_MASTER )
- : wfGetDB( DB_SLAVE );
+ : wfGetDB( DB_REPLICA );
$row = $db->selectRow( 'account_requests', '*', [ 'acr_name' =>
$name ], __METHOD__ );
if ( !$row ) {
return null;
diff --git a/business/AccountConfirmSubmission.php
b/business/AccountConfirmSubmission.php
index b9afa59..1e63fbd 100644
--- a/business/AccountConfirmSubmission.php
+++ b/business/AccountConfirmSubmission.php
@@ -1,7 +1,5 @@
<?php
-use MediaWiki\Auth\AuthManager;
-
class AccountConfirmSubmission {
/* User making the confirmation */
protected $admin;
diff --git a/composer.json b/composer.json
index daa26e1..1c8beff 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.12.0",
+ "mediawiki/mediawiki-codesniffer": "13.0.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/frontend/specialpages/actions/UserCredentials_body.php
b/frontend/specialpages/actions/UserCredentials_body.php
index b0c1045..053efde 100644
--- a/frontend/specialpages/actions/UserCredentials_body.php
+++ b/frontend/specialpages/actions/UserCredentials_body.php
@@ -243,7 +243,7 @@
return false;
}
# For now, just get the first revision...
- $dbr = wfGetDB( DB_SLAVE );
+ $dbr = wfGetDB( DB_REPLICA );
$row = $dbr->selectRow( 'account_credentials', '*',
[ 'acd_user_id' => $uid ],
__METHOD__,
--
To view, visit https://gerrit.wikimedia.org/r/380114
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d46a58426b09cb442a502e3353c4fd9b5ce924b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ConfirmAccount
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
