From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 28 Sep 2016 23:08:15 +0000 (-0700)
Subject: Move DatabaseBase to a class alias for type-hints
X-Git-Tag: 1.31.0-rc.0~5273^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=0bdab07814d52fcef7ceac0792ca9f15f72e712b;p=lhc%2Fweb%2Fwiklou.git

Move DatabaseBase to a class alias for type-hints

Change-Id: Ib6bbbd751358cbc2f2d2767c80721d3d8f142c0d
---

diff --git a/autoload.php b/autoload.php
index dfb0bf6b50..8e019b8272 100644
--- a/autoload.php
+++ b/autoload.php
@@ -317,7 +317,7 @@ $wgAutoloadLocalClasses = [
 	'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/libs/rdbms/database/Database.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/Database.php b/includes/libs/rdbms/database/Database.php
index 2b058e991d..4f1f38ec6a 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -3426,3 +3426,5 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 		}
 	}
 }
+
+class_alias( 'Database', 'DatabaseBase' );
diff --git a/includes/libs/rdbms/database/DatabaseBase.php b/includes/libs/rdbms/database/DatabaseBase.php
deleted file mode 100644
index 71e5f93357..0000000000
--- a/includes/libs/rdbms/database/DatabaseBase.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * @defgroup Database Database
- *
- * This file deals with database interface functions
- * and query specifics/optimisations.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Database
- */
-
-/**
- * Database abstraction object
- * @ingroup Database
- */
-abstract class DatabaseBase extends Database {
-	// Backwards-compatibility alias for type-hints
-}
diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index c31b9f9ed2..d654429317 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 a69a5fac6c..f58628e942 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 156e5252b3..3ccf3f002a 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;
 
diff --git a/includes/utils/AutoloadGenerator.php b/includes/utils/AutoloadGenerator.php
index 395ce379f8..319b5d4854 100644
--- a/includes/utils/AutoloadGenerator.php
+++ b/includes/utils/AutoloadGenerator.php
@@ -160,6 +160,7 @@ class AutoloadGenerator {
 	 *
 	 * @param {string} $commandName Command name to include in comment
 	 * @param {string} $filename of PHP file to put autoload information in.
+	 * @return string
 	 */
 	protected function generatePHPAutoload( $commandName, $filename ) {
 		// No existing JSON file found; update/generate PHP file
@@ -290,6 +291,10 @@ EOD;
 		foreach ( glob( $this->basepath . '/*.php' ) as $file ) {
 			$this->readFile( $file );
 		}
+
+		// Legacy aliases
+		$this->forceClassPath( 'DatabaseBase',
+			$this->basepath . '/includes/libs/rdbms/database/Database.php' );
 	}
 }