Introduce ISetConfigValuesTransactional for transactional config behaviour

[friendica.git] / src / Module / Install.php

diff --git a/src/Module/Install.php b/src/Module/Install.php
index 2b287d96beaaf720e540826311ec4b4e9341f984..c1c3cda355a4626c0399f002c50668d3c5ff52f6 100644 (file)
--- a/src/Module/Install.php
+++ b/src/Module/Install.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
  *
@@ -104,7 +104,7 @@ class Install extends BaseModule
                $this->currentWizardStep = ($_POST['pass'] ?? '') ?: self::SYSTEM_CHECK;
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                $configCache = $this->app->getConfigCache();
 
@@ -170,8 +170,8 @@ class Install extends BaseModule
                                        return;
                                }
 
-                               $this->installer->installDatabase($configCache->get('system', 'basepath'));
-                       
+                               $this->installer->installDatabase();
+
                                // install allowed themes to register theme hooks
                                // this is same as "Reload active theme" in /admin/themes
                                $allowed_themes = Theme::getAllowedList();
@@ -337,7 +337,7 @@ class Install extends BaseModule
 
                                if (count($this->installer->getChecks()) == 0) {
                                        $txt            = '<p style="font-size: 130%;">';
-                                       $txt            .= $this->t('Your Friendica site database has been installed.') . EOL;
+                                       $txt            .= $this->t('Your Friendica site database has been installed.') . '<br />';
                                        $db_return_text .= $txt;
                                }
 
@@ -363,7 +363,7 @@ class Install extends BaseModule
         * @return string The text for the next steps
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       private function whatNext()
+       private function whatNext(): string
        {
                $baseurl = $this->baseUrl->get();
                return
@@ -383,6 +383,7 @@ class Install extends BaseModule
         * @param string                                   $cat         The category of the setting
         * @param string                                   $key         The key of the setting
         * @param null|string                              $default     The default value
+        * @return void
         */
        private function checkSetting(Cache $configCache, array $post, string $cat, string $key, ?string $default = null)
        {