Replace calls for App with AppHelper in Module\Install

diff --git a/src/Module/Install.php b/src/Module/Install.php
index f9d9782250da1901e2f162f3f31bdf9d021046c1..4907f31860810fc7868be00a569e1f11731a5dac 100644 (file)
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -7,10 +7,14 @@
 
 namespace Friendica\Module;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Mode;
+use Friendica\AppHelper;
 use Friendica\BaseModule;
 use Friendica\Core;
 use Friendica\Core\Config\ValueObject\Cache;
+use Friendica\Core\Installer;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Theme;
@@ -51,20 +55,20 @@ class Install extends BaseModule
        private $currentWizardStep;
 
        /**
-        * @var Core\Installer The installer
+        * @var Installer The installer
         */
        private $installer;
 
-       /** @var App */
-       protected $app;
-       /** @var App\Mode */
+       /** @var AppHelper */
+       protected $appHelper;
+       /** @var Mode */
        protected $mode;
 
-       public function __construct(App $app, BasePath $basePath, App\Mode $mode, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Core\Installer $installer, array $server, array $parameters = [])
+       public function __construct(AppHelper $appHelper, BasePath $basePath, Mode $mode, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Installer $installer, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               $this->app       = $app;
+               $this->appHelper = $appHelper;
                $this->mode      = $mode;
                $this->installer = $installer;
 
@@ -80,7 +84,7 @@ class Install extends BaseModule
                }
 
                // get basic installation information and save them to the config cache
-               $configCache = $this->app->getConfigCache();
+               $configCache = $this->appHelper->getConfigCache();
                $this->installer->setUpCache($configCache, $basePath->getPath());
 
                // We overwrite current theme css, because during install we may not have a working mod_rewrite
@@ -92,7 +96,7 @@ class Install extends BaseModule
 
        protected function post(array $request = [])
        {
-               $configCache = $this->app->getConfigCache();
+               $configCache = $this->appHelper->getConfigCache();
 
                switch ($this->currentWizardStep) {
                        case self::SYSTEM_CHECK:
@@ -168,7 +172,7 @@ class Install extends BaseModule
 
        protected function content(array $request = []): string
        {
-               $configCache = $this->app->getConfigCache();
+               $configCache = $this->appHelper->getConfigCache();
 
                $output = '';