jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/380140 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 13.0.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 13.0.0
Change-Id: I52a92c793fb5fcfa837be52bf37ded02cfe41e79
---
M MediaWikiFarmer.php
M MediaWikiFarmer_Wiki.php
M composer.json
3 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MediaWikiFarmer.php b/MediaWikiFarmer.php
index 6bc85b0..80084c8 100644
--- a/MediaWikiFarmer.php
+++ b/MediaWikiFarmer.php
@@ -454,7 +454,7 @@
}
if ( $this->useDatabase() ) {
- $dbr = $this->getDB( DB_SLAVE );
+ $dbr = $this->getDB( DB_REPLICA );
$res = $dbr->select( 'farmer_extension', '*', [],
__METHOD__ );
$this->_extensions = [];
foreach ( $res as $row ) {
@@ -540,7 +540,7 @@
*/
public function getFarmList() {
if ( $this->useDatabase() ) {
- $dbr = $this->getDB( DB_SLAVE );
+ $dbr = $this->getDB( DB_REPLICA );
$res = $dbr->select( 'farmer_wiki', [
'fw_name', 'fw_title', 'fw_description'
], [], __METHOD__ );
diff --git a/MediaWikiFarmer_Wiki.php b/MediaWikiFarmer_Wiki.php
index 2fa727c..67cd3ec 100644
--- a/MediaWikiFarmer_Wiki.php
+++ b/MediaWikiFarmer_Wiki.php
@@ -70,7 +70,7 @@
$farmer = MediaWikiFarmer::getInstance();
if ( $farmer->useDatabase() ) {
- $dbr = $farmer->getDB( DB_SLAVE );
+ $dbr = $farmer->getDB( DB_REPLICA );
$row = $dbr->selectRow( 'farmer_wiki', '*', [ 'fw_name'
=> $wiki ], __METHOD__ );
if ( $row === false ) {
return new MediaWikiFarmer_Wiki( $wiki,
$variables );
@@ -117,7 +117,7 @@
$wiki->_variables = unserialize( $row->fw_parameters );
$wiki->_permissions = unserialize( $row->fw_permissions );
- $dbr = MediaWikiFarmer::getInstance()->getDB( DB_SLAVE );
+ $dbr = MediaWikiFarmer::getInstance()->getDB( DB_REPLICA );
$res = $dbr->select(
[ 'farmer_extension', 'farmer_wiki_extension' ],
'*',
@@ -162,7 +162,7 @@
$farmer = MediaWikiFarmer::getInstance();
if ( $farmer->useDatabase() ) {
- return (bool)$farmer->getDB( DB_SLAVE )->selectField(
+ return (bool)$farmer->getDB( DB_REPLICA )->selectField(
'farmer_wiki', 1, [ 'fw_name' =>
$this->_name ], __METHOD__
);
} else {
diff --git a/composer.json b/composer.json
index 7c63cad..6394fcf 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": {
--
To view, visit https://gerrit.wikimedia.org/r/380140
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I52a92c793fb5fcfa837be52bf37ded02cfe41e79
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Farmer
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
