X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FInstaller.php;h=8bdb00f0459131c222cc63804618a8f29285a9c2;hb=8f58d2d84eb510d8ed7e75ac8ab2a238bc199b12;hp=de041773ef6b88b7525b7a35cad64ce043e9e798;hpb=c82127ffb7972e687d31b245237e21f3308097e2;p=friendica.git

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index de041773ef..8bdb00f045 100644
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -7,12 +7,10 @@ namespace Friendica\Core;
 use DOMDocument;
 use Exception;
 use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\Database\Database;
 use Friendica\Database\DBStructure;
-use Friendica\Factory\DBFactory;
-use Friendica\Object\Image;
-use Friendica\Util\Logger\VoidLogger;
+use Friendica\Util\Images;
 use Friendica\Util\Network;
-use Friendica\Util\Profiler;
 use Friendica\Util\Strings;
 
 /**
@@ -571,7 +569,7 @@ class Installer
 
 		if (class_exists('Imagick')) {
 			$imagick = true;
-			$supported = Image::supportedTypes();
+			$supported = Images::supportedTypes();
 			if (array_key_exists('image/gif', $supported)) {
 				$gif = true;
 			}
@@ -592,17 +590,16 @@ class Installer
 	/**
 	 * Checking the Database connection and if it is available for the current installation
 	 *
-	 * @param ConfigCache $configCache The configuration cache
-	 * @param Profiler    $profiler    The profiler of this app
+	 * @param Database $dba
 	 *
 	 * @return bool true if the check was successful, otherwise false
 	 * @throws Exception
 	 */
-	public function checkDB(ConfigCache $configCache, Profiler $profiler)
+	public function checkDB(Database $dba)
 	{
-		$database = DBFactory::init($configCache, $profiler, [], new VoidLogger());
+		$dba->reconnect();
 
-		if ($database->connected()) {
+		if ($dba->isConnected()) {
 			if (DBStructure::existsTable('user')) {
 				$this->addCheck(L10n::t('Database already in use.'), false, true, '');