]> git.mxchange.org Git - friendica.git/blobdiff - src/Console/AutomaticInstallation.php
Merge pull request #11150 from annando/user-banner
[friendica.git] / src / Console / AutomaticInstallation.php
index 37ba2dc1376c2fd539ff938d6644f03d087b25e2..e80cc66147d9322bad7dc1836760f606fbcc9e1e 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,22 +24,21 @@ namespace Friendica\Console;
 use Asika\SimpleConsole\Console;
 use Friendica\App;
 use Friendica\App\BaseURL;
-use Friendica\Core\Config\IConfig;
-use Friendica\Core\Config\Cache;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Core\Installer;
 use Friendica\Core\Theme;
 use Friendica\Database\Database;
 use Friendica\Util\BasePath;
-use Friendica\Util\ConfigFileLoader;
 use RuntimeException;
 
 class AutomaticInstallation extends Console
 {
        /** @var App\Mode */
        private $appMode;
-       /** @var Cache */
+       /** @var \Friendica\Core\Config\ValueObject\Cache */
        private $configCache;
-       /** @var IConfig */
+       /** @var IManageConfigValues */
        private $config;
        /** @var Database */
        private $dba;
@@ -66,7 +65,7 @@ Options
     -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)
     -d|--dbdata <database>    The name of the mysql/mariadb database (env MYSQL_DATABASE)
-    -U|--dbuser <username>    The username of the mysql/mariadb database login (env MYSQL_USER or MYSQL_USERNAME)
+    -u|--dbuser <username>    The username of the mysql/mariadb database login (env MYSQL_USER or MYSQL_USERNAME)
     -P|--dbpass <password>    The password of the mysql/mariadb database login (env MYSQL_PASSWORD)
     -U|--url <url>            The full base URL of Friendica - f.e. 'https://friendica.local/sub' (env FRIENDICA_URL) 
     -B|--phppath <php_path>   The path of the PHP binary (env FRIENDICA_PHP_PATH)
@@ -94,12 +93,12 @@ Examples
        bin/console autoinstall --savedb
                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
+       bin/console autoinstall -H localhost -p 3365 -u user -P passwort1234 -d friendica -U https://friendica.fqdn
                Installs Friendica with a local mysql database with credentials
 HELP;
        }
 
-       public function __construct(App\Mode $appMode, Cache $configCache, IConfig $config, Database $dba, array $argv = null)
+       public function __construct(App\Mode $appMode, Cache $configCache, IManageConfigValues $config, Database $dba, array $argv = null)
        {
                parent::__construct($argv);
 
@@ -112,7 +111,7 @@ HELP;
        protected function doExecute()
        {
                // Initialise the app
-               $this->out("Initializing setup...\n");
+               $this->out("Initializing setup...");
 
                $installer = new Installer();
 
@@ -121,10 +120,10 @@ HELP;
                $basepath     = new BasePath($basePathConf);
                $installer->setUpCache($configCache, $basepath->getPath());
 
-               $this->out(" Complete!\n\n");
+               $this->out(" Complete!\n");
 
                // Check Environment
-               $this->out("Checking environment...\n");
+               $this->out("Checking environment...");
 
                $installer->resetChecks();
 
@@ -133,24 +132,26 @@ HELP;
                        throw new RuntimeException($errorMessage);
                }
 
-               $this->out(" Complete!\n\n");
+               $this->out(" Complete!\n");
 
                // if a config file is set,
                $config_file = $this->getOption(['f', 'file']);
 
                if (!empty($config_file)) {
-
+                       $this->out("Loading config file '$config_file'...");
                        if (!file_exists($config_file)) {
-                               throw new RuntimeException("ERROR: Config file does not exist.\n");
+                               throw new RuntimeException("ERROR: Config file does not exist.");
                        }
 
-                       //reload the config cache
-                       $loader = new ConfigFileLoader($config_file);
-                       $loader->setupCache($configCache);
-
+                       //append config file to the config cache
+                       $config = include($config_file);
+                       if (!is_array($config)) {
+                               throw new Exception('Error loading config file ' . $config_file);
+                       }
+                       $configCache->load($config, Cache::SOURCE_FILE);
                } else {
                        // Creating config file
-                       $this->out("Creating config file...\n");
+                       $this->out("Creating config file...");
 
                        $save_db = $this->getOption(['s', 'savedb'], false);
 
@@ -161,7 +162,7 @@ HELP;
                                $this->getOption(['d', 'dbdata'],
                                        ($save_db) ? getenv('MYSQL_DATABASE') : ''));
                        $configCache->set('database', 'username',
-                               $this->getOption(['U', 'dbuser'],
+                               $this->getOption(['u', 'dbuser'],
                                        ($save_db) ? getenv('MYSQL_USER') . getenv('MYSQL_USERNAME') : ''));
                        $configCache->set('database', 'password',
                                $this->getOption(['P', 'dbpass'],
@@ -202,10 +203,10 @@ HELP;
                        $installer->createConfig($configCache);
                }
 
-               $this->out("Complete!\n\n");
+               $this->out(" Complete!\n");
 
                // Check database connection
-               $this->out("Checking database...\n");
+               $this->out("Checking database...");
 
                $installer->resetChecks();
 
@@ -214,7 +215,7 @@ HELP;
                        throw new RuntimeException($errorMessage);
                }
 
-               $this->out(" Complete!\n\n");
+               $this->out(" Complete!\n");
 
                // Install database
                $this->out("Inserting data into database...\n");
@@ -228,31 +229,31 @@ HELP;
 
                if (!empty($config_file) && $config_file != 'config' . DIRECTORY_SEPARATOR . 'local.config.php') {
                        // Copy config file
-                       $this->out("Copying config file...\n");
-                       if (!copy($basePathConf . DIRECTORY_SEPARATOR . $config_file, $basePathConf . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.config.php')) {
+                       $this->out("Copying config file...");
+                       if (!copy($config_file, $basePathConf . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.config.php')) {
                                throw new RuntimeException("ERROR: Saving config file failed. Please copy '$config_file' to '" . $basePathConf . "'" . DIRECTORY_SEPARATOR . "config" . DIRECTORY_SEPARATOR . "local.config.php' manually.\n");
                        }
                }
 
-               $this->out(" Complete!\n\n");
+               $this->out(" Complete!\n");
 
                // Install theme
-               $this->out("Installing theme\n");
+               $this->out("Installing theme");
                if (!empty($this->config->get('system', 'theme'))) {
                        Theme::install($this->config->get('system', 'theme'));
-                       $this->out(" Complete\n\n");
+                       $this->out(" Complete\n");
                } else {
-                       $this->out(" Theme setting is empty. Please check the file 'config/local.config.php'\n\n");
+                       $this->out(" Theme setting is empty. Please check the file 'config/local.config.php'\n");
                }
 
-               $this->out("\nInstallation is finished\n");
+               $this->out("\nInstallation is finished");
 
                return 0;
        }
 
        /**
-        * @param Installer $installer   The Installer instance
-        * @param Cache     $configCache The config cache
+        * @param Installer                                $installer   The Installer instance
+        * @param \Friendica\Core\Config\ValueObject\Cache $configCache The config cache
         *
         * @return bool true if checks were successfully, otherwise false
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException