X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FInstaller.php;h=de041773ef6b88b7525b7a35cad64ce043e9e798;hb=79e69ee52807967858f5cb89e702be035f979ba5;hp=52a51498e8228e68d05e22f9c999fde1295d7f1c;hpb=90a38a00d8d642cb7473523539b64aa7c836a8c5;p=friendica.git

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 52a51498e8..de041773ef 100644
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -6,12 +6,11 @@ namespace Friendica\Core;
 
 use DOMDocument;
 use Exception;
-use Friendica\Core\Config\Cache\IConfigCache;
-use Friendica\Database\DBA;
+use Friendica\Core\Config\Cache\ConfigCache;
 use Friendica\Database\DBStructure;
+use Friendica\Factory\DBFactory;
 use Friendica\Object\Image;
 use Friendica\Util\Logger\VoidLogger;
-use Friendica\Util\BasePath;
 use Friendica\Util\Network;
 use Friendica\Util\Profiler;
 use Friendica\Util\Strings;
@@ -131,12 +130,12 @@ class Installer
 	 * - Creates `config/local.config.php`
 	 * - Installs Database Structure
 	 *
-	 * @param IConfigCache $configCache The config cache with all config relevant information
+	 * @param ConfigCache $configCache The config cache with all config relevant information
 	 *
 	 * @return bool true if the config was created, otherwise false
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public function createConfig(IConfigCache $configCache)
+	public function createConfig(ConfigCache $configCache)
 	{
 		$basepath = $configCache->get('system', 'basepath');
 
@@ -247,8 +246,9 @@ class Installer
 			$help .= L10n::t("If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>") . EOL;
 			$help .= EOL . EOL;
 			$tpl = Renderer::getMarkupTemplate('field_input.tpl');
+			/// @todo Separate backend Installer class and presentation layer/view
 			$help .= Renderer::replaceMacros($tpl, [
-				'$field' => ['config.php_path', L10n::t('PHP executable path'), $phppath, L10n::t('Enter full path to php executable. You can leave this blank to continue the installation.')],
+				'$field' => ['config-php_path', L10n::t('PHP executable path'), $phppath, L10n::t('Enter full path to php executable. You can leave this blank to continue the installation.')],
 			]);
 			$phppath = "";
 		}
@@ -592,31 +592,26 @@ class Installer
 	/**
 	 * Checking the Database connection and if it is available for the current installation
 	 *
-	 * @param IConfigCache $configCache The configuration cache
+	 * @param ConfigCache $configCache The configuration cache
 	 * @param Profiler    $profiler    The profiler of this app
 	 *
 	 * @return bool true if the check was successful, otherwise false
 	 * @throws Exception
 	 */
-	public function checkDB(IConfigCache $configCache, Profiler $profiler)
+	public function checkDB(ConfigCache $configCache, Profiler $profiler)
 	{
-		$dbhost = $configCache->get('database', 'hostname');
-		$dbuser = $configCache->get('database', 'username');
-		$dbpass = $configCache->get('database', 'password');
-		$dbdata = $configCache->get('database', 'database');
+		$database = DBFactory::init($configCache, $profiler, [], new VoidLogger());
 
-		if (!DBA::connect($configCache, $profiler, new VoidLogger(), $dbhost, $dbuser, $dbpass, $dbdata)) {
-			$this->addCheck(L10n::t('Could not connect to database.'), false, true, '');
-
-			return false;
-		}
-
-		if (DBA::connected()) {
+		if ($database->connected()) {
 			if (DBStructure::existsTable('user')) {
 				$this->addCheck(L10n::t('Database already in use.'), false, true, '');
 
 				return false;
 			}
+		} else {
+			$this->addCheck(L10n::t('Could not connect to database.'), false, true, '');
+
+			return false;
 		}
 
 		return true;
@@ -625,12 +620,12 @@ class Installer
 	/**
 	 * Setup the default cache for a new installation
 	 *
-	 * @param IConfigCache $configCache The configuration cache
+	 * @param ConfigCache $configCache The configuration cache
 	 * @param string       $basePath    The determined basepath
 	 *
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public function setUpCache(IConfigCache $configCache, $basePath)
+	public function setUpCache(ConfigCache $configCache, $basePath)
 	{
 		$configCache->set('config', 'php_path'  , $this->getPHPPath());
 		$configCache->set('system', 'basepath'  , $basePath);