Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-19 07:50:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make BaseModule a real entity

Browse source 
- Add all dependencies, necessary to run the content (baseUrl, Arguments)
- Encapsulate all POST/GET/DELETE/PATCH/PUT methods as protected methods inside the BaseModule
- Return Module content ONLY per `BaseModule::run()` (including the Hook logic there as well)
This commit is contained in:
Philipp 2021-11-20 15:38:03 +01:00
parent 238613fd01
commit 8bdd90066f
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
252 changed files with 615 additions and 623 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Module/Install.php
View file

@ -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, Core\Installer $installer, array $server, array $parameters = [])
{
parent::__construct($l10n, $parameters);
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $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 = [], array $post = [])
{
$configCache = $this->app->getConfigCache();
@ -187,7 +186,7 @@ class Install extends BaseModule
}
}
public function content(): string
protected function content(array $request = []): string
{
$configCache = $this->app->getConfigCache();