Remove deprecated App::getHostName() - process methods to DI::baseUrl()->getHostName()

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

diff --git a/src/Module/Install.php b/src/Module/Install.php
index 7ba40396659927f15df9f6b28b3759c33c2d4e13..10a6176e402e2fba7f3866da298b45f93dfb2888 100644 (file)
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -8,6 +8,7 @@ use Friendica\Core;
 use Friendica\Core\Config\Cache\ConfigCache;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 use Friendica\Network\HTTPException;
 use Friendica\Util\BasePath;
 use Friendica\Util\Strings;
@@ -46,18 +47,17 @@ class Install extends BaseModule
         */
        private static $installer;
 
-       public static function init()
+       public static function init(array $parameters = [])
        {
-               $a = self::getApp();
+               $a = DI::app();
 
-               if (!$a->getMode()->isInstall()) {
+               if (!DI::mode()->isInstall()) {
                        throw new HTTPException\ForbiddenException();
                }
 
                // route: install/testrwrite
                // $baseurl/install/testrwrite to test if rewrite in .htaccess is working
-               // @TODO: Replace with parameter from router
-               if ($a->getArgumentValue(1, '') == 'testrewrite') {
+               if (DI::args()->get(1, '') == 'testrewrite') {
                        // Status Code 204 means that it worked without content
                        throw new HTTPException\NoContentException();
                }
@@ -73,12 +73,12 @@ class Install extends BaseModule
                // so we may not have a css at all. Here we set a static css file for the install procedure pages
                Renderer::$theme['stylesheet'] = $a->getBaseURL() . '/view/install/style.css';
 
-               self::$currentWizardStep = defaults($_POST, 'pass', self::SYSTEM_CHECK);
+               self::$currentWizardStep = ($_POST['pass'] ?? '') ?: self::SYSTEM_CHECK;
        }
 
-       public static function post()
+       public static function post(array $parameters = [])
        {
-               $a           = self::getApp();
+               $a           = DI::app();
                $configCache = $a->getConfigCache();
 
                switch (self::$currentWizardStep) {
@@ -110,7 +110,7 @@ class Install extends BaseModule
                                self::checkSetting($configCache, $_POST, 'database', 'database', '');
 
                                // If we cannot connect to the database, return to the previous step
-                               if (!self::$installer->checkDB($a->getDBA())) {
+                               if (!self::$installer->checkDB(DI::dba())) {
                                        self::$currentWizardStep = self::DATABASE_CONFIG;
                                }
 
@@ -134,7 +134,7 @@ class Install extends BaseModule
                                self::checkSetting($configCache, $_POST, 'config', 'admin_email', '');
 
                                // If we cannot connect to the database, return to the Database config wizard
-                               if (!self::$installer->checkDB($a->getDBA())) {
+                               if (!self::$installer->checkDB(DI::dba())) {
                                        self::$currentWizardStep = self::DATABASE_CONFIG;
                                        return;
                                }
@@ -149,9 +149,9 @@ class Install extends BaseModule
                }
        }
 
-       public static function content()
+       public static function content(array $parameters = [])
        {
-               $a           = self::getApp();
+               $a           = DI::app();
                $configCache = $a->getConfigCache();
 
                $output = '';
@@ -345,8 +345,8 @@ class Install extends BaseModule
        {
                $configCache->set($cat, $key,
                        Strings::escapeTags(
-                               trim(defaults($post, sprintf('%s-%s', $cat, $key),
-                                               (!isset($default) ? $configCache->get($cat, $key) : $default))
+                               trim(($post[sprintf('%s-%s', $cat, $key)] ?? '') ?:
+                                               ($default ?? $configCache->get($cat, $key))
                                )
                        )
                );