Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/313336
Change subject: Move DatabaseBase to /compat as an interface for type-hints
......................................................................
Move DatabaseBase to /compat as an interface for type-hints
Change-Id: Ib6bbbd751358cbc2f2d2767c80721d3d8f142c0d
---
M autoload.php
R includes/compat/DatabaseBase.php
M includes/libs/rdbms/database/DatabaseMysqlBase.php
M includes/libs/rdbms/database/DatabasePostgres.php
M includes/libs/rdbms/database/DatabaseSqlite.php
5 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/36/313336/1
diff --git a/autoload.php b/autoload.php
index dfb0bf6..09deb6e 100644
--- a/autoload.php
+++ b/autoload.php
@@ -317,7 +317,7 @@
'DBUnexpectedError' => __DIR__ .
'/includes/libs/rdbms/exception/DBUnexpectedError.php',
'DataUpdate' => __DIR__ . '/includes/deferred/DataUpdate.php',
'Database' => __DIR__ . '/includes/libs/rdbms/database/Database.php',
- 'DatabaseBase' => __DIR__ .
'/includes/libs/rdbms/database/DatabaseBase.php',
+ 'DatabaseBase' => __DIR__ . '/includes/compat/DatabaseBase.php',
'DatabaseDomain' => __DIR__ .
'/includes/libs/rdbms/database/DatabaseDomain.php',
'DatabaseInstaller' => __DIR__ .
'/includes/installer/DatabaseInstaller.php',
'DatabaseLag' => __DIR__ . '/maintenance/lag.php',
diff --git a/includes/libs/rdbms/database/DatabaseBase.php
b/includes/compat/DatabaseBase.php
similarity index 95%
rename from includes/libs/rdbms/database/DatabaseBase.php
rename to includes/compat/DatabaseBase.php
index 71e5f93..d5c871f 100644
--- a/includes/libs/rdbms/database/DatabaseBase.php
+++ b/includes/compat/DatabaseBase.php
@@ -28,6 +28,6 @@
* Database abstraction object
* @ingroup Database
*/
-abstract class DatabaseBase extends Database {
+interface DatabaseBase extends IDatabase {
// Backwards-compatibility alias for type-hints
}
diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php
b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index c31b9f9..d654429 100644
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@ -29,7 +29,7 @@
* @since 1.22
* @see Database
*/
-abstract class DatabaseMysqlBase extends DatabaseBase {
+abstract class DatabaseMysqlBase extends Database {
/** @var MysqlMasterPos */
protected $lastKnownReplicaPos;
/** @var string Method to detect replica DB lag */
diff --git a/includes/libs/rdbms/database/DatabasePostgres.php
b/includes/libs/rdbms/database/DatabasePostgres.php
index a69a5fa..f58628e 100644
--- a/includes/libs/rdbms/database/DatabasePostgres.php
+++ b/includes/libs/rdbms/database/DatabasePostgres.php
@@ -24,7 +24,7 @@
/**
* @ingroup Database
*/
-class DatabasePostgres extends DatabaseBase {
+class DatabasePostgres extends Database {
/** @var int|bool */
protected $port;
diff --git a/includes/libs/rdbms/database/DatabaseSqlite.php
b/includes/libs/rdbms/database/DatabaseSqlite.php
index 156e525..3ccf3f0 100644
--- a/includes/libs/rdbms/database/DatabaseSqlite.php
+++ b/includes/libs/rdbms/database/DatabaseSqlite.php
@@ -25,7 +25,7 @@
/**
* @ingroup Database
*/
-class DatabaseSqlite extends DatabaseBase {
+class DatabaseSqlite extends Database {
/** @var bool Whether full text is enabled */
private static $fulltextEnabled = null;
--
To view, visit https://gerrit.wikimedia.org/r/313336
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6bbbd751358cbc2f2d2767c80721d3d8f142c0d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
