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 65561b097ef9c3398e2383f39369ebc0d2cb9203..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\App;
-use Friendica\Core\Config\Cache\IConfigCache;
-use Friendica\Database\DBA;
+use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\Database\Database;
 use Friendica\Database\DBStructure;
-use Friendica\Object\Image;
+use Friendica\Util\Images;
 use Friendica\Util\Network;
-use Friendica\Util\Profiler;
 use Friendica\Util\Strings;
 
 /**
@@ -130,15 +128,15 @@ class Installer
         * - Creates `config/local.config.php`
         * - Installs Database Structure
         *
-        * @param App          $app         The Friendica App
-        * @param IConfigCache $configCache The config cache with all config relevant information
-        * @param string $basepath  The basepath of Friendica
+        * @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(App $app, IConfigCache $configCache, $basepath)
+       public function createConfig(ConfigCache $configCache)
        {
+               $basepath = $configCache->get('system', 'basepath');
+
                $tpl = Renderer::getMarkupTemplate('local.config.tpl');
                $txt = Renderer::replaceMacros($tpl, [
                        '$dbhost'    => $configCache->get('database', 'hostname'),
@@ -146,12 +144,16 @@ class Installer
                        '$dbpass'    => $configCache->get('database', 'password'),
                        '$dbdata'    => $configCache->get('database', 'database'),
 
-                       '$phpath'    => $this->getPHPPath(),
+                       '$phpath'    => $configCache->get('config', 'php_path'),
                        '$adminmail' => $configCache->get('config', 'admin_email'),
+                       '$hostname'  => $configCache->get('config', 'hostname'),
 
+                       '$urlpath'   => $configCache->get('system', 'urlpath'),
+                       '$baseurl'   => $configCache->get('system', 'url'),
+                       '$sslpolicy' => $configCache->get('system', 'ssl_policy'),
+                       '$basepath'  => $basepath,
                        '$timezone'  => $configCache->get('system', 'default_timezone'),
                        '$language'  => $configCache->get('system', 'language'),
-                       '$urlpath'   => $app->getURLPath(),
                ]);
 
                $result = file_put_contents($basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.config.php', $txt);
@@ -242,8 +244,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' => ['phpath', 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 = "";
                }
@@ -566,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;
                        }
@@ -587,34 +590,41 @@ class Installer
        /**
         * Checking the Database connection and if it is available for the current installation
         *
-        * @param string       $basePath    The basepath of this call
-        * @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($basePath, IConfigCache $configCache, Profiler $profiler)
+       public function checkDB(Database $dba)
        {
-               $dbhost = $configCache->get('database', 'hostname');
-               $dbuser = $configCache->get('database', 'username');
-               $dbpass = $configCache->get('database', 'password');
-               $dbdata = $configCache->get('database', 'database');
-
-               if (!DBA::connect($basePath, $configCache, $profiler, $dbhost, $dbuser, $dbpass, $dbdata)) {
-                       $this->addCheck(L10n::t('Could not connect to database.'), false, true, '');
+               $dba->reconnect();
 
-                       return false;
-               }
-
-               if (DBA::connected()) {
+               if ($dba->isConnected()) {
                        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;
        }
+
+       /**
+        * Setup the default cache for a new installation
+        *
+        * @param ConfigCache $configCache The configuration cache
+        * @param string       $basePath    The determined basepath
+        *
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        */
+       public function setUpCache(ConfigCache $configCache, $basePath)
+       {
+               $configCache->set('config', 'php_path'  , $this->getPHPPath());
+               $configCache->set('system', 'basepath'  , $basePath);
+       }
 }