]> git.mxchange.org Git - friendica.git/blobdiff - src/Core/Console/AutomaticInstallation.php
1) Refactor App->config[] into Core\Config
[friendica.git] / src / Core / Console / AutomaticInstallation.php
index c4e542e762738a674e3f3213f68d88b69c875273..9a63f56ed419b10d9856ed0d2119ddce807ff6fd 100644 (file)
@@ -5,14 +5,10 @@ namespace Friendica\Core\Console;
 use Asika\SimpleConsole\Console;
 use Friendica\BaseObject;
 use Friendica\Core\Config;
-use Friendica\Core\Install;
+use Friendica\Core\Installer;
 use Friendica\Core\Theme;
-use Friendica\Database\DBA;
-use Friendica\Database\DBStructure;
 use RuntimeException;
 
-require_once 'include/dba.php';
-
 class AutomaticInstallation extends Console
 {
        protected function getHelp()
@@ -23,7 +19,7 @@ Synopsis
        bin/console autoinstall [-h|--help|-?] [-v] [-a] [-f]
 
 Description
-    Installs Friendica with data based on the local.ini.php file or environment variables
+    Installs Friendica with data based on the local.config.php file or environment variables
 
 Notes
     Not checking .htaccess/URL-Rewrite during CLI installation.
@@ -32,7 +28,7 @@ Options
     -h|--help|-?            Show help information
     -v                      Show more debug information.
     -a                      All setup checks are required (except .htaccess)
-    -f|--file <config>      prepared config file (e.g. "config/local.ini.php" itself) which will override every other config option - except the environment variables)
+    -f|--file <config>      prepared config file (e.g. "config/local.config.php" itself) which will override every other config option - except the environment variables)
     -s|--savedb             Save the DB credentials to the file (if environment variables is used)
     -H|--dbhost <host>      The host of the mysql/mariadb database (env MYSQL_HOST)
     -p|--dbport <port>      The port of the mysql/mariadb database (env MYSQL_PORT)
@@ -58,11 +54,11 @@ Environment variables
    FRIENDICA_LANG              The langauge of Friendica
    
 Examples
-       bin/console autoinstall -f 'input.ini.php
-               Installs Friendica with the prepared 'input.ini.php' file
+       bin/console autoinstall -f 'input.config.php
+               Installs Friendica with the prepared 'input.config.php' file
 
        bin/console autoinstall --savedb
-               Installs Friendica with environment variables and saves them to the 'config/local.ini.php' file
+               Installs Friendica with environment variables and saves them to the 'config/local.config.php' file
 
        bin/console autoinstall -h localhost -p 3365 -U user -P passwort1234 -d friendica
                Installs Friendica with a local mysql database with credentials
@@ -76,24 +72,38 @@ HELP;
 
                $a = BaseObject::getApp();
 
-               $install = new Install();
+               $installer = new Installer();
+
+               $this->out(" Complete!\n\n");
+
+               // Check Environment
+               $this->out("Checking environment...\n");
+
+               $installer->resetChecks();
+
+               if (!$this->runBasicChecks($installer)) {
+                       $errorMessage = $this->extractErrors($installer->getChecks());
+                       throw new RuntimeException($errorMessage);
+               }
+
+               $this->out(" Complete!\n\n");
 
                // if a config file is set,
                $config_file = $this->getOption(['f', 'file']);
 
                if (!empty($config_file)) {
-                       if ($config_file != 'config' . DIRECTORY_SEPARATOR . 'local.ini.php') {
+                       if ($config_file != 'config' . DIRECTORY_SEPARATOR . 'local.config.php') {
                                // Copy config file
                                $this->out("Copying config file...\n");
-                               if (!copy($a->getBasePath() . DIRECTORY_SEPARATOR . $config_file, $a->getBasePath() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.ini.php')) {
-                                       throw new RuntimeException("ERROR: Saving config file failed. Please copy '$config_file' to '" . $a->getBasePath() . "'"  . DIRECTORY_SEPARATOR . "config" . DIRECTORY_SEPARATOR . "local.ini.php' manually.\n");
+                               if (!copy($a->getBasePath() . DIRECTORY_SEPARATOR . $config_file, $a->getBasePath() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.config.php')) {
+                                       throw new RuntimeException("ERROR: Saving config file failed. Please copy '$config_file' to '" . $a->getBasePath() . "'"  . DIRECTORY_SEPARATOR . "config" . DIRECTORY_SEPARATOR . "local.config.php' manually.\n");
                                }
                        }
 
-                       $db_host = $a->getConfigValue('database', 'hostname');
-                       $db_user = $a->getConfigValue('database', 'username');
-                       $db_pass = $a->getConfigValue('database', 'password');
-                       $db_data = $a->getConfigValue('database', 'database');
+                       $db_host = Config::getConfigValue('database', 'hostname');
+                       $db_user = Config::getConfigValue('database', 'username');
+                       $db_pass = Config::getConfigValue('database', 'password');
+                       $db_data = Config::getConfigValue('database', 'database');
                } else {
                        // Creating config file
                        $this->out("Creating config file...\n");
@@ -105,16 +115,20 @@ HELP;
                        $db_data = $this->getOption(['d', 'dbdata'], ($save_db) ? getenv('MYSQL_DATABASE') : '');
                        $db_user = $this->getOption(['U', 'dbuser'], ($save_db) ? getenv('MYSQL_USER') . getenv('MYSQL_USERNAME') : '');
                        $db_pass = $this->getOption(['P', 'dbpass'], ($save_db) ? getenv('MYSQL_PASSWORD') : '');
-                       $url_path = $this->getOption(['u', 'urlpath'], (!empty('FRIENDICA_URL_PATH')) ? getenv('FRIENDICA_URL_PATH') : null);
-                       $php_path = $this->getOption(['b', 'phppath'], (!empty('FRIENDICA_PHP_PATH')) ? getenv('FRIENDICA_PHP_PATH') : null);
-                       $admin_mail = $this->getOption(['A', 'admin'], (!empty('FRIENDICA_ADMIN_MAIL')) ? getenv('FRIENDICA_ADMIN_MAIL') : '');
-                       $tz = $this->getOption(['T', 'tz'], (!empty('FRIENDICA_TZ')) ? getenv('FRIENDICA_TZ') : '');
-                       $lang = $this->getOption(['L', 'lang'], (!empty('FRIENDICA_LANG')) ? getenv('FRIENDICA_LANG') : '');
+                       $url_path = $this->getOption(['u', 'urlpath'], !empty('FRIENDICA_URL_PATH') ? getenv('FRIENDICA_URL_PATH') : null);
+                       $php_path = $this->getOption(['b', 'phppath'], !empty('FRIENDICA_PHP_PATH') ? getenv('FRIENDICA_PHP_PATH') : null);
+                       $admin_mail = $this->getOption(['A', 'admin'], !empty('FRIENDICA_ADMIN_MAIL') ? getenv('FRIENDICA_ADMIN_MAIL') : '');
+                       $tz = $this->getOption(['T', 'tz'], !empty('FRIENDICA_TZ') ? getenv('FRIENDICA_TZ') : '');
+                       $lang = $this->getOption(['L', 'lang'], !empty('FRIENDICA_LANG') ? getenv('FRIENDICA_LANG') : '');
+
+                       if (empty($php_path)) {
+                               $php_path = $installer->getPHPPath();
+                       }
 
-                       $install->createConfig(
+                       $installer->createConfig(
                                $php_path,
                                $url_path,
-                               ((!empty($db_port)) ? $db_host . ':' . $db_port : $db_host),
+                               (!empty($db_port) ? $db_host . ':' . $db_port : $db_host),
                                $db_user,
                                $db_pass,
                                $db_data,
@@ -127,30 +141,13 @@ HELP;
 
                $this->out(" Complete!\n\n");
 
-               // Check basic setup
-               $this->out("Checking basic setup...\n");
-
-               $checkResults = [];
-
-               $this->runBasicChecks($install);
-
-               $checkResults['basic'] = $install->getChecks();
-               $errorMessage = $this->extractErrors($checkResults['basic']);
-
-               if ($errorMessage !== '') {
-                       throw new RuntimeException($errorMessage);
-               }
-
-               $this->out(" Complete!\n\n");
-
                // Check database connection
                $this->out("Checking database...\n");
 
-               $checkResults['db'] = array();
-               $checkResults['db'][] = $this->runDatabaseCheck($db_host, $db_user, $db_pass, $db_data);
-               $errorMessage = $this->extractErrors($checkResults['db']);
+               $installer->resetChecks();
 
-               if ($errorMessage !== '') {
+               if (!$installer->checkDB($db_host, $db_user, $db_pass, $db_data)) {
+                       $errorMessage = $this->extractErrors($installer->getChecks());
                        throw new RuntimeException($errorMessage);
                }
 
@@ -159,10 +156,11 @@ HELP;
                // Install database
                $this->out("Inserting data into database...\n");
 
-               $checkResults['data'] = DBStructure::update(false, true, true);
+               $installer->resetChecks();
 
-               if ($checkResults['data'] !== '') {
-                       throw new RuntimeException("ERROR: DB Database creation error. Is the DB empty?\n");
+               if (!$installer->installDatabase()) {
+                       $errorMessage = $this->extractErrors($installer->getChecks());
+                       throw new RuntimeException($errorMessage);
                }
 
                $this->out(" Complete!\n\n");
@@ -173,7 +171,7 @@ HELP;
                        Theme::install(Config::get('system', 'theme'));
                        $this->out(" Complete\n\n");
                } else {
-                       $this->out(" Theme setting is empty. Please check the file 'config/local.ini.php'\n\n");
+                       $this->out(" Theme setting is empty. Please check the file 'config/local.config.php'\n\n");
                }
 
                $this->out("\nInstallation is finished\n");
@@ -182,52 +180,44 @@ HELP;
        }
 
        /**
-        * @param Install $install the Installer instance
+        * @param Installer $installer the Installer instance
+        *
+        * @return bool true if checks were successfully, otherwise false
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       private function runBasicChecks(Install $install)
+       private function runBasicChecks(Installer $installer)
        {
-               $install->resetChecks();
-               $install->checkFunctions();
-               $install->checkImagick();
-               $install->checkLocalIni();
-               $install->checkSmarty3();
-               $install->checkKeys();
+               $checked = true;
 
-               if (!empty(Config::get('config', 'php_path'))) {
-                       if (!$install->checkPHP(Config::get('config', 'php_path'), true)) {
-                               throw new RuntimeException(" ERROR: The php_path is not valid in the config.\n");
-                       }
-               } else {
-                       throw new RuntimeException(" ERROR: The php_path is not set in the config.\n");
+               $installer->resetChecks();
+               if (!$installer->checkFunctions())              {
+                       $checked = false;
+               }
+               if (!$installer->checkImagick()) {
+                       $checked = false;
+               }
+               if (!$installer->checkLocalIni()) {
+                       $checked = false;
+               }
+               if (!$installer->checkSmarty3()) {
+                       $checked = false;
+               }
+               if (!$installer->checkKeys()) {
+                       $checked = false;
                }
 
-               $this->out(" NOTICE: Not checking .htaccess/URL-Rewrite during CLI installation.\n");
-       }
-
-       /**
-        * @param $db_host
-        * @param $db_user
-        * @param $db_pass
-        * @param $db_data
-        *
-        * @return array
-        */
-       private function runDatabaseCheck($db_host, $db_user, $db_pass, $db_data)
-       {
-               $result = array(
-                       'title' => 'MySQL Connection',
-                       'required' => true,
-                       'status' => true,
-                       'help' => '',
-               );
-
+               $php_path = null;
+               if (!empty(Config::get('config', 'php_path'))) {
+                       $php_path = Config::get('config', 'php_path');
+               }
 
-               if (!DBA::connect($db_host, $db_user, $db_pass, $db_data)) {
-                       $result['status'] = false;
-                       $result['help'] = 'Failed, please check your MySQL settings and credentials.';
+               if (!$installer->checkPHP($php_path, true)) {
+                       $checked = false;
                }
 
-               return $result;
+               $this->out(" NOTICE: Not checking .htaccess/URL-Rewrite during CLI installation.\n");
+
+               return $checked;
        }
 
        /**