spelling: unable

[friendica.git] / src / Console / AutomaticInstallation.php

diff --git a/src/Console/AutomaticInstallation.php b/src/Console/AutomaticInstallation.php
index 72128c12707ffab5a1a3f629800c3b851de6f2fe..1ce516e25f66484d5a3abd4630855243755a02d3 100644 (file)
--- a/src/Console/AutomaticInstallation.php
+++ b/src/Console/AutomaticInstallation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,8 +24,8 @@ 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;
@@ -36,9 +36,9 @@ 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;
@@ -64,6 +64,7 @@ Options
     -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)
+    -s|--dbsocket <socket>    The socket of the mysql/mariadb database (env MYSQL_SOCKET)
     -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)
     -P|--dbpass <password>    The password of the mysql/mariadb database login (env MYSQL_PASSWORD)
@@ -76,6 +77,7 @@ Options
 Environment variables
    MYSQL_HOST                  The host of the mysql/mariadb database (mandatory if mysql and environment is used)
    MYSQL_PORT                  The port of the mysql/mariadb database
+   MYSQL_SOCKET                The socket of the mysql/mariadb database
    MYSQL_USERNAME|MYSQL_USER   The username of the mysql/mariadb database login (MYSQL_USERNAME is for mysql, MYSQL_USER for mariadb)
    MYSQL_PASSWORD              The password of the mysql/mariadb database login
    MYSQL_DATABASE              The name of the mysql/mariadb database
@@ -93,12 +95,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);
 
@@ -108,7 +110,7 @@ HELP;
                $this->dba         = $dba;
        }
 
-       protected function doExecute()
+       protected function doExecute(): int
        {
                // Initialise the app
                $this->out("Initializing setup...");
@@ -157,6 +159,7 @@ HELP;
 
                        $db_host = $this->getOption(['H', 'dbhost'], ($save_db) ? (getenv('MYSQL_HOST')) : Installer::DEFAULT_HOST);
                        $db_port = $this->getOption(['p', 'dbport'], ($save_db) ? getenv('MYSQL_PORT') : null);
+                       $db_socket = $this->getOption(['s', 'dbsocket'], ($save_db) ? getenv('MYSQL_SOCKET') : null);
                        $configCache->set('database', 'hostname', $db_host . (!empty($db_port) ? ':' . $db_port : ''));
                        $configCache->set('database', 'database',
                                $this->getOption(['d', 'dbdata'],
@@ -196,8 +199,7 @@ HELP;
                                $this->out('The Friendica URL has to be set during CLI installation.');
                                return 1;
                        } else {
-                               $baseUrl = new BaseURL($this->config, []);
-                               $baseUrl->saveByURL($url);
+                               $configCache->set('system', 'url', $url);
                        }
 
                        $installer->createConfig($configCache);
@@ -222,7 +224,7 @@ HELP;
 
                $installer->resetChecks();
 
-               if (!$installer->installDatabase($basePathConf)) {
+               if (!$installer->installDatabase()) {
                        $errorMessage = $this->extractErrors($installer->getChecks());
                        throw new RuntimeException($errorMessage);
                }
@@ -252,8 +254,8 @@ HELP;
        }
 
        /**
-        * @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