Remove the activity

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

diff --git a/src/Module/Install.php b/src/Module/Install.php
index 4385ba85175dcb361dc183e5e949fc5c40fe04de..1631cfe7f4b8ef83f459c09b4857b13998f189a8 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-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -31,7 +31,9 @@ use Friendica\Core\Theme;
 use Friendica\DI;
 use Friendica\Network\HTTPException;
 use Friendica\Util\BasePath;
+use Friendica\Util\Profiler;
 use Friendica\Util\Temporal;
+use Psr\Log\LoggerInterface;
 
 class Install extends BaseModule
 {
@@ -70,16 +72,13 @@ class Install extends BaseModule
        protected $app;
        /** @var App\Mode */
        protected $mode;
-       /** @var App\BaseURL */
-       protected $baseUrl;
 
-       public function __construct(App $app, App\Mode $mode, App\BaseURL $baseUrl, App\Arguments $args, Core\Installer $installer, L10n $l10n, array $parameters = [])
+       public function __construct(App $app, App\Mode $mode, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Core\Installer $installer, array $server, array $parameters = [])
        {
-               parent::__construct($l10n, $parameters);
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->app       = $app;
                $this->mode      = $mode;
-               $this->baseUrl   = $baseUrl;
                $this->installer = $installer;
 
                if (!$this->mode->isInstall()) {
@@ -105,7 +104,7 @@ class Install extends BaseModule
                $this->currentWizardStep = ($_POST['pass'] ?? '') ?: self::SYSTEM_CHECK;
        }
 
-       public function post()
+       protected function post(array $request = [])
        {
                $configCache = $this->app->getConfigCache();
 
@@ -171,7 +170,7 @@ 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
@@ -187,7 +186,7 @@ class Install extends BaseModule
                }
        }
 
-       public function content(): string
+       protected function content(array $request = []): string
        {
                $configCache = $this->app->getConfigCache();
 
@@ -338,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;
                                }
 
@@ -364,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
@@ -384,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)
        {