From 4f509e92ab3bcb5d98a540f4d15d173fd16baee3 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 14 Sep 2016 02:21:18 -0700 Subject: [PATCH] Move DBConnRef and ChronologyProtector to /libs/rdbms Change-Id: If2c4b314a5c39311328843f534d91bf90823e179 --- autoload.php | 4 ++-- .../chronologyprotector}/ChronologyProtector.php | 0 .../rdbms/database/RBConnRef.php} | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) rename includes/{db => libs/rdbms/chronologyprotector}/ChronologyProtector.php (100%) rename includes/{db/DBConnRef.php => libs/rdbms/database/RBConnRef.php} (97%) diff --git a/autoload.php b/autoload.php index 66736b3d42..557df832cf 100644 --- a/autoload.php +++ b/autoload.php @@ -241,7 +241,7 @@ $wgAutoloadLocalClasses = [ 'CheckStorage' => __DIR__ . '/maintenance/storage/checkStorage.php', 'CheckSyntax' => __DIR__ . '/maintenance/checkSyntax.php', 'CheckUsernames' => __DIR__ . '/maintenance/checkUsernames.php', - 'ChronologyProtector' => __DIR__ . '/includes/db/ChronologyProtector.php', + 'ChronologyProtector' => __DIR__ . '/includes/libs/rdbms/chronologyprotector/ChronologyProtector.php', 'ClassCollector' => __DIR__ . '/includes/utils/AutoloadGenerator.php', 'CleanupAncientTables' => __DIR__ . '/maintenance/cleanupAncientTables.php', 'CleanupBlocks' => __DIR__ . '/maintenance/cleanupBlocks.php', @@ -299,7 +299,7 @@ $wgAutoloadLocalClasses = [ 'DBAccessBase' => __DIR__ . '/includes/dao/DBAccessBase.php', 'DBAccessError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php', 'DBAccessObjectUtils' => __DIR__ . '/includes/dao/DBAccessObjectUtils.php', - 'DBConnRef' => __DIR__ . '/includes/db/DBConnRef.php', + 'DBConnRef' => __DIR__ . '/includes/libs/rdbms/database/RBConnRef.php', 'DBConnectionError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php', 'DBError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php', 'DBExpectedError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php', diff --git a/includes/db/ChronologyProtector.php b/includes/libs/rdbms/chronologyprotector/ChronologyProtector.php similarity index 100% rename from includes/db/ChronologyProtector.php rename to includes/libs/rdbms/chronologyprotector/ChronologyProtector.php diff --git a/includes/db/DBConnRef.php b/includes/libs/rdbms/database/RBConnRef.php similarity index 97% rename from includes/db/DBConnRef.php rename to includes/libs/rdbms/database/RBConnRef.php index 8604295385..e606340b91 100644 --- a/includes/db/DBConnRef.php +++ b/includes/libs/rdbms/database/RBConnRef.php @@ -8,10 +8,10 @@ * @since 1.22 */ class DBConnRef implements IDatabase { - /** @var LoadBalancer */ + /** @var ILoadBalancer */ private $lb; - /** @var DatabaseBase|null */ + /** @var IDatabase|null Live connection handle */ private $conn; /** @var array|null */ @@ -22,13 +22,13 @@ class DBConnRef implements IDatabase { const FLD_WIKI = 2; /** - * @param LoadBalancer $lb - * @param DatabaseBase|array $conn Connection or (server index, group, wiki ID) + * @param ILoadBalancer $lb + * @param IDatabase|array $conn Connection or (server index, group, wiki ID) */ - public function __construct( LoadBalancer $lb, $conn ) { + public function __construct( ILoadBalancer $lb, $conn ) { $this->lb = $lb; - if ( $conn instanceof DatabaseBase ) { - $this->conn = $conn; + if ( $conn instanceof IDatabase ) { + $this->conn = $conn; // live handle } elseif ( count( $conn ) >= 3 && $conn[self::FLD_WIKI] !== false ) { $this->params = $conn; } else { -- 2.20.1