From 5f17ce574fa37e84592d1dc1518ae34d58654b6f Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 23 Feb 2019 12:50:52 +0100
Subject: [PATCH] Fixing DBA::(re-)connect()

---
 src/Database/DBA.php   | 10 +++++-----
 tests/DatabaseTest.php |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index 95f721e7c8..897ab2e6ed 100644
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -43,7 +43,7 @@ class DBA
 	/**
 	 * @var string
 	 */
-	private static $basedir;
+	private static $basePath;
 	private static $server_info = '';
 	private static $connection;
 	private static $driver;
@@ -59,14 +59,14 @@ class DBA
 	private static $db_name = '';
 	private static $db_charset = '';
 
-	public static function connect($basedir, IConfigCache $configCache, Profiler $profiler, $serveraddr, $user, $pass, $db, $charset = null)
+	public static function connect($basePath, IConfigCache $configCache, Profiler $profiler, $serveraddr, $user, $pass, $db, $charset = null)
 	{
 		if (!is_null(self::$connection) && self::connected()) {
 			return true;
 		}
 
 		// We are storing these values for being able to perform a reconnect
-		self::$basedir = $basedir;
+		self::$basePath = $basePath;
 		self::$configCache = $configCache;
 		self::$profiler = $profiler;
 		self::$db_serveraddr = $serveraddr;
@@ -169,7 +169,7 @@ class DBA
 	public static function reconnect() {
 		self::disconnect();
 
-		$ret = self::connect(self::$basedir, self::$configCache, self::$profiler, self::$db_serveraddr, self::$db_user, self::$db_pass, self::$db_name, self::$db_charset);
+		$ret = self::connect(self::$basePath, self::$configCache, self::$profiler, self::$db_serveraddr, self::$db_user, self::$db_pass, self::$db_name, self::$db_charset);
 		return $ret;
 	}
 
@@ -1039,7 +1039,7 @@ class DBA
 	 * This process must only be started once, since the value is cached.
 	 */
 	private static function buildRelationData() {
-		$definition = DBStructure::definition(self::$basedir);
+		$definition = DBStructure::definition(self::$basePath);
 
 		foreach ($definition AS $table => $structure) {
 			foreach ($structure['fields'] AS $field => $field_struct) {
diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index bb87cf36dc..3ff4c6fe14 100644
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -40,14 +40,14 @@ abstract class DatabaseTest extends MockedTest
 			$this->markTestSkipped('Please set the MYSQL_* environment variables to your test database credentials.');
 		}
 
-		$basedir = BasePath::create(dirname(__DIR__));
-		$configLoader = new Cache\ConfigCacheLoader($basedir);
+		$basePath = BasePath::create(dirname(__DIR__));
+		$configLoader = new Cache\ConfigCacheLoader($basePath);
 		$config = Factory\ConfigFactory::createCache($configLoader);
 
 		$profiler = \Mockery::mock(Profiler::class);
 
 		DBA::connect(
-			$basedir,
+			$basePath,
 			$config,
 			$profiler,
 			getenv('MYSQL_HOST'),