Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 00:00:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace calls for App with AppHelper in Module\Install

Browse source
This commit is contained in:
Art4 2024-11-10 08:46:50 +00:00
parent d9d1e9e0e0
commit 81c0c56e5a
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Module/Install.php
View file

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