Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/402157 )
Change subject: Use namespaced version of IDatabase and ResultWrapper
......................................................................
Use namespaced version of IDatabase and ResultWrapper
Change-Id: I971f3fec630513bf68de5e1880672017cc19adbc
---
M includes/CorporaLookup.php
M includes/Database.php
M includes/Stats.php
M includes/Translation.php
M includes/TranslationStorageManager.php
5 files changed, 20 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/57/402157/1
diff --git a/includes/CorporaLookup.php b/includes/CorporaLookup.php
index f7770fe..bfc37d9 100644
--- a/includes/CorporaLookup.php
+++ b/includes/CorporaLookup.php
@@ -8,17 +8,20 @@
namespace ContentTranslation;
+use Wikimedia\Rdbms\IDatabase;
+use Wikimedia\Rdbms\ResultWrapper;
+
class CorporaLookup {
const TYPE_SOURCE = 'source';
const TYPE_MT = 'mt';
const TYPE_USER = 'user';
/**
- * @var \IDatabase
+ * @var IDatabase
*/
protected $db;
- public function __construct( \IDatabase $db ) {
+ public function __construct( IDatabase $db ) {
$this->db = $db;
}
@@ -45,7 +48,7 @@
return self::format( $res );
}
- protected static function format( \ResultWrapper $rows ) {
+ protected static function format( ResultWrapper $rows ) {
$sections = [];
foreach ( $rows as $row ) {
diff --git a/includes/Database.php b/includes/Database.php
index 6ffcafc..5bf6950 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -8,7 +8,7 @@
/**
* Gets a database connection to the ContentTranslation database
* @param int $type Either DB_REPLICA or DB_MASTER
- * @return \IDatabase
+ * @return \Wikimedia\Rdbms\IDatabase
*/
public static function getConnection( $type ) {
global $wgContentTranslationDatabase,
$wgContentTranslationCluster;
diff --git a/includes/Stats.php b/includes/Stats.php
index c803696..e02e879 100644
--- a/includes/Stats.php
+++ b/includes/Stats.php
@@ -7,6 +7,8 @@
*/
namespace ContentTranslation;
+use Wikimedia\Rdbms\ResultWrapper;
+
/**
* Functions for getting ContentTranslation metrics.
*/
diff --git a/includes/Translation.php b/includes/Translation.php
index 4906f10..a8b5545 100644
--- a/includes/Translation.php
+++ b/includes/Translation.php
@@ -4,6 +4,8 @@
*/
namespace ContentTranslation;
+use Wikimedia\Rdbms\IDatabase;
+
class Translation {
private $lastSaveWasCreate = false;
@@ -454,7 +456,7 @@
return $this->translation;
}
- public static function getPublishedCondition( \IDatabase $db ) {
+ public static function getPublishedCondition( IDatabase $db ) {
return $db->makeList(
[
'translation_status' => 'published',
diff --git a/includes/TranslationStorageManager.php
b/includes/TranslationStorageManager.php
index 3179b99..4ecffa8 100644
--- a/includes/TranslationStorageManager.php
+++ b/includes/TranslationStorageManager.php
@@ -6,15 +6,17 @@
namespace ContentTranslation;
+use Wikimedia\Rdbms\IDatabase;
+
class TranslationStorageManager {
/**
* Update a translation unit.
*
- * @param \IDatabase $db
+ * @param IDatabase $db
* @param TranslationUnit $translationUnit
* @param int $timestamp
*/
- private static function update( \IDatabase $db, TranslationUnit
$translationUnit, $timestamp ) {
+ private static function update( IDatabase $db, TranslationUnit
$translationUnit, $timestamp ) {
$values = [
'cxc_sequence_id' => $translationUnit->getSequenceId(),
'cxc_timestamp' => $db->timestamp(),
@@ -36,10 +38,10 @@
/**
* Insert a translation unit.
*
- * @param \IDatabase $db
+ * @param IDatabase $db
* @param TranslationUnit $translationUnit
*/
- private static function create( \IDatabase $db, TranslationUnit
$translationUnit ) {
+ private static function create( IDatabase $db, TranslationUnit
$translationUnit ) {
$values = [
'cxc_translation_id' =>
$translationUnit->getTranslationId(),
'cxc_section_id' => $translationUnit->getSectionId(),
@@ -79,7 +81,7 @@
$dbw->doAtomicSection(
__METHOD__,
- function ( \IDatabase $dbw ) use ( $translationUnit,
$newTranslation ) {
+ function ( IDatabase $dbw ) use ( $translationUnit,
$newTranslation ) {
if ( $newTranslation ) {
// T134245: brand new translations can
also insert corpora data in the same
// request. The doFind() query uses
only a subset of a unique cx_corpora index,
@@ -134,7 +136,7 @@
return self::doFind( $db, $conditions, [], __METHOD__ );
}
- private static function doFind( \IDatabase $db, $conditions, $options,
$method ) {
+ private static function doFind( IDatabase $db, $conditions, $options,
$method ) {
$options['ORDER BY'] = 'cxc_timestamp DESC';
$row = $db->selectRow( 'cx_corpora', '*', $conditions, $method,
$options );
--
To view, visit https://gerrit.wikimedia.org/r/402157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I971f3fec630513bf68de5e1880672017cc19adbc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
