jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/380118 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 13.0.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 13.0.0
Change-Id: Ifb3d18d75a9a35d4fe3500aeebbcae3110d6b66c
---
M api/ApiQueryContentTranslation.php
M api/ApiQueryContentTranslationCorpora.php
M composer.json
M includes/Stats.php
M includes/Translation.php
M includes/TranslationStorageManager.php
M includes/Translator.php
M scripts/dump-corpora.php
M scripts/fix-stats.php
9 files changed, 24 insertions(+), 26 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/api/ApiQueryContentTranslation.php
b/api/ApiQueryContentTranslation.php
index 2530ebf..90f3c4b 100644
--- a/api/ApiQueryContentTranslation.php
+++ b/api/ApiQueryContentTranslation.php
@@ -158,7 +158,7 @@
* @return array
*/
protected function getTranslationContent( Translation $translation ) {
- $db = Database::getConnection( DB_SLAVE );
+ $db = Database::getConnection( DB_REPLICA );
$lookup = new CorporaLookup( $db );
$content = $lookup->getByTranslationId(
$translation->getTranslationId() );
diff --git a/api/ApiQueryContentTranslationCorpora.php
b/api/ApiQueryContentTranslationCorpora.php
index 96cec80..53a17d3 100644
--- a/api/ApiQueryContentTranslationCorpora.php
+++ b/api/ApiQueryContentTranslationCorpora.php
@@ -26,7 +26,7 @@
$params = $this->extractRequestParams();
$result = $this->getResult();
- $db = Database::getConnection( DB_SLAVE );
+ $db = Database::getConnection( DB_REPLICA );
$lookup = new CorporaLookup( $db );
$data = $lookup->getByTranslationId( $params['translationid'] );
diff --git a/composer.json b/composer.json
index 8bb731c..ed0f996 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,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/includes/Stats.php b/includes/Stats.php
index 22376c6..31a29d0 100644
--- a/includes/Stats.php
+++ b/includes/Stats.php
@@ -18,7 +18,7 @@
* @return ResultWrapper Current CX stats.
*/
public static function getStats() {
- $dbr = wfGetDB( DB_SLAVE );
+ $dbr = wfGetDB( DB_REPLICA );
return $dbr->select(
[
diff --git a/includes/Translation.php b/includes/Translation.php
index 43da941..96ac98e 100644
--- a/includes/Translation.php
+++ b/includes/Translation.php
@@ -80,7 +80,7 @@
* translation exists and chooses either of create or update actions.
*/
public function save( Translator $translator ) {
- $dbr = Database::getConnection( DB_SLAVE );
+ $dbr = Database::getConnection( DB_REPLICA );
// Temporary code to work with and without the new index.
// The old index cx_translation_pair was on (source title,
source language,
@@ -136,7 +136,7 @@
return null;
}
- $dbr = Database::getConnection( DB_SLAVE );
+ $dbr = Database::getConnection( DB_REPLICA );
$values = [
'translation_source_language' => $sourceLanguage,
'translation_target_language' => $targetLanguage,
@@ -173,7 +173,7 @@
* @return Translation|null
*/
public static function findForTranslator( TranslationWork $work,
Translator $translator ) {
- $dbr = Database::getConnection( DB_SLAVE );
+ $dbr = Database::getConnection( DB_REPLICA );
$values = [
'translation_source_language' =>
$work->getSourceLanguage(),
'translation_target_language' =>
$work->getTargetLanguage(),
@@ -202,7 +202,7 @@
[ $work->getPage() ]
);
- $dbr = Database::getConnection( DB_SLAVE );
+ $dbr = Database::getConnection( DB_REPLICA );
if ( $dbr->indexExists( 'cx_translations', 'cx_translation_ref'
) ) {
foreach ( $drafts as $index => $draft ) {
if ( $draft->getData()['status'] !== 'draft' ) {
@@ -241,7 +241,7 @@
* was published atleast once.
*/
public static function getDraftStats() {
- $dbr = Database::getConnection( DB_SLAVE );
+ $dbr = Database::getConnection( DB_REPLICA );
$rows = $dbr->select(
'cx_translations',
@@ -280,7 +280,7 @@
* If the translation has a target_url it was published atleast once.
*/
public static function getPublishedStats() {
- $dbr = Database::getConnection( DB_SLAVE );
+ $dbr = Database::getConnection( DB_REPLICA );
$rows = $dbr->select(
'cx_translations',
@@ -320,7 +320,7 @@
* language pairs, with given interval.
*/
public static function getDeletionTrend( $interval ) {
- $dbr = wfGetDB( DB_SLAVE );
+ $dbr = wfGetDB( DB_REPLICA );
$conditions = [
'ct_tag' => 'contenttranslation',
@@ -378,7 +378,7 @@
public static function getTrendByStatus(
$source, $target, $status, $interval, $translatorId
) {
- $dbr = Database::getConnection( DB_SLAVE );
+ $dbr = Database::getConnection( DB_REPLICA );
$conditions = [];
if ( $status === 'published' ) {
@@ -469,7 +469,7 @@
* @return array
*/
public static function getAllPublishedTranslations( $from, $to, $limit,
$offset ) {
- $dbr = Database::getConnection( DB_SLAVE );
+ $dbr = Database::getConnection( DB_REPLICA );
$conditions = [ $dbr->makeList(
[
'translation_status' => 'published',
diff --git a/includes/TranslationStorageManager.php
b/includes/TranslationStorageManager.php
index fad6c64..0b5bad4 100644
--- a/includes/TranslationStorageManager.php
+++ b/includes/TranslationStorageManager.php
@@ -8,8 +8,6 @@
namespace ContentTranslation;
-use ContentTranslation\TranslationUnit;
-
class TranslationStorageManager {
/**
* Update a translation unit.
@@ -127,7 +125,7 @@
* @return TranslationUnit|null
*/
public static function find( $translationId, $sectionId, $origin ) {
- $db = Database::getConnection( DB_SLAVE );
+ $db = Database::getConnection( DB_REPLICA );
$conditions = [
'cxc_translation_id' => $translationId,
diff --git a/includes/Translator.php b/includes/Translator.php
index 8cdb217..510a337 100644
--- a/includes/Translator.php
+++ b/includes/Translator.php
@@ -53,7 +53,7 @@
* @return Translation|null
*/
public function getTranslation( $translationId ) {
- $dbr = Database::getConnection( DB_SLAVE );
+ $dbr = Database::getConnection( DB_REPLICA );
$row = $dbr->selectRow(
[ 'cx_translators', 'cx_translations' ],
'*',
@@ -88,7 +88,7 @@
$to = null
) {
// Note: there is no index on translation_last_updated_timestamp
- $dbr = Database::getConnection( DB_SLAVE );
+ $dbr = Database::getConnection( DB_REPLICA );
$tables = [ 'cx_translations', 'cx_translators' ];
$fields = '*';
@@ -128,7 +128,7 @@
public function getLanguages( $type ) {
// Note: there is no index on translation_last_updated_timestamp
- $dbr = Database::getConnection( DB_SLAVE );
+ $dbr = Database::getConnection( DB_REPLICA );
$queries = [];
foreach ( [ 'source', 'target' ] as $field ) {
@@ -160,7 +160,7 @@
* @return Integer
*/
public function getTranslationsCount() {
- $dbr = Database::getConnection( DB_SLAVE );
+ $dbr = Database::getConnection( DB_REPLICA );
$count = $dbr->selectField(
[ 'cx_translators', 'cx_translations' ],
'count(*)',
@@ -204,7 +204,7 @@
'target' => 'translation_target_language',
];
- $dbr = Database::getConnection( DB_SLAVE );
+ $dbr = Database::getConnection( DB_REPLICA );
$table = 'cx_translations';
$fields = [
@@ -238,7 +238,7 @@
* @return Integer Number of translators
*/
public static function getTotalTranslatorsCount() {
- $dbr = Database::getConnection( DB_SLAVE );
+ $dbr = Database::getConnection( DB_REPLICA );
$table = 'cx_translations';
$fields = [
diff --git a/scripts/dump-corpora.php b/scripts/dump-corpora.php
index 7c2981c..13c0e98 100644
--- a/scripts/dump-corpora.php
+++ b/scripts/dump-corpora.php
@@ -126,7 +126,7 @@
);
// Fetch the actual interesting data
- $db = Database::getConnection( DB_SLAVE );
+ $db = Database::getConnection( DB_REPLICA );
$lookup = new CorporaLookup( $db );
foreach ( $translations as &$translation ) {
$translation['corpora'] = $lookup->getByTranslationId(
$translation['translationId'] );
diff --git a/scripts/fix-stats.php b/scripts/fix-stats.php
index 6fab8b1..3526c02 100644
--- a/scripts/fix-stats.php
+++ b/scripts/fix-stats.php
@@ -185,7 +185,7 @@
return;
}
- $dbr = wfGetDB( DB_SLAVE );
+ $dbr = wfGetDB( DB_REPLICA );
$conds = [];
# Assuming timestamps are in the correct format already
$conds[] = 'log_timestamp > ' . $dbr->addQuotes(
$row->translation_start_timestamp );
@@ -209,7 +209,7 @@
}
protected function hasCxTag( Title $title, $row ) {
- $dbr = wfGetDB( DB_SLAVE );
+ $dbr = wfGetDB( DB_REPLICA );
$conds = [];
# Apparently translation_start_timestamp has been incorrecly
updated on changes in the past
# $conds[] = 'rev_timestamp > ' . $dbr->addQuotes(
$row->translation_start_timestamp );
@@ -222,7 +222,7 @@
}
protected function findRevisionToTag( Title $title, $name, $timestamp )
{
- $dbr = wfGetDB( DB_SLAVE );
+ $dbr = wfGetDB( DB_REPLICA );
// Allow one minute slack
$ts = wfTimestamp( TS_UNIX, $timestamp ) + 60;
--
To view, visit https://gerrit.wikimedia.org/r/380118
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb3d18d75a9a35d4fe3500aeebbcae3110d6b66c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader <tools.libraryupgra...@tools.wmflabs.org>
Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
