Merge pull request #7945 from MrPetovan/bug/fatal-errors

[friendica.git] / src / Core / Installer.php

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index f49dde4e560adf9f136941e1fedf33287a80d93b..8bdb00f0459131c222cc63804618a8f29285a9c2 100644 (file)
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -6,13 +6,11 @@ namespace Friendica\Core;
 
 use DOMDocument;
 use Exception;
-use Friendica\Core\Config\Cache\IConfigCache;
+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;
 
 /**
@@ -130,12 +128,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');
 
@@ -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 IConfigCache $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(IConfigCache $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, '');
 
@@ -620,12 +617,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);