Fix module instantiation in Profile\Index module
- Address https://github.com/friendica/friendica/issues/11992#issuecomment-1357441775
This commit is contained in:
parent
29330a4205
commit
eb9af005f0
1 changed files with 50 additions and 2 deletions
|
@ -21,8 +21,19 @@
|
||||||
|
|
||||||
namespace Friendica\Module\Profile;
|
namespace Friendica\Module\Profile;
|
||||||
|
|
||||||
|
use Friendica\App;
|
||||||
use Friendica\BaseModule;
|
use Friendica\BaseModule;
|
||||||
|
use Friendica\Content\Conversation;
|
||||||
|
use Friendica\Core\Config\Capability\IManageConfigValues;
|
||||||
use Friendica\Core\L10n;
|
use Friendica\Core\L10n;
|
||||||
|
use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
|
||||||
|
use Friendica\Core\Session\Capability\IHandleUserSessions;
|
||||||
|
use Friendica\Database\Database;
|
||||||
|
use Friendica\Module\Response;
|
||||||
|
use Friendica\Profile\ProfileField\Repository\ProfileField;
|
||||||
|
use Friendica\Util\DateTimeFormat;
|
||||||
|
use Friendica\Util\Profiler;
|
||||||
|
use Psr\Log\LoggerInterface;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Profile index router
|
* Profile index router
|
||||||
|
@ -35,13 +46,50 @@ use Friendica\Core\L10n;
|
||||||
*/
|
*/
|
||||||
class Index extends BaseModule
|
class Index extends BaseModule
|
||||||
{
|
{
|
||||||
|
/** @var Database */
|
||||||
|
private $database;
|
||||||
|
/** @var App */
|
||||||
|
private $app;
|
||||||
|
/** @var IHandleUserSessions */
|
||||||
|
private $session;
|
||||||
|
/** @var IManageConfigValues */
|
||||||
|
private $config;
|
||||||
|
/** @var App\Page */
|
||||||
|
private $page;
|
||||||
|
/** @var ProfileField */
|
||||||
|
private $profileField;
|
||||||
|
/** @var DateTimeFormat */
|
||||||
|
private $dateTimeFormat;
|
||||||
|
/** @var Conversation */
|
||||||
|
private $conversation;
|
||||||
|
/** @var IManagePersonalConfigValues */
|
||||||
|
private $pConfig;
|
||||||
|
/** @var App\Mode */
|
||||||
|
private $mode;
|
||||||
|
|
||||||
|
public function __construct(App\Mode $mode, IManagePersonalConfigValues $pConfig, Conversation $conversation, DateTimeFormat $dateTimeFormat, ProfileField $profileField, App\Page $page, IManageConfigValues $config, IHandleUserSessions $session, App $app, Database $database, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
|
||||||
|
{
|
||||||
|
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
|
||||||
|
|
||||||
|
$this->database = $database;
|
||||||
|
$this->app = $app;
|
||||||
|
$this->session = $session;
|
||||||
|
$this->config = $config;
|
||||||
|
$this->page = $page;
|
||||||
|
$this->profileField = $profileField;
|
||||||
|
$this->dateTimeFormat = $dateTimeFormat;
|
||||||
|
$this->conversation = $conversation;
|
||||||
|
$this->pConfig = $pConfig;
|
||||||
|
$this->mode = $mode;
|
||||||
|
}
|
||||||
|
|
||||||
protected function rawContent(array $request = [])
|
protected function rawContent(array $request = [])
|
||||||
{
|
{
|
||||||
(new Profile($this->l10n, $this->baseUrl, $this->args, $this->logger, $this->profiler, $this->response, $this->server, $this->parameters))->rawContent();
|
(new Profile($this->profileField, $this->page, $this->config, $this->session, $this->app, $this->database, $this->l10n, $this->baseUrl, $this->args, $this->logger, $this->profiler, $this->response, $this->server, $this->parameters))->rawContent();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function content(array $request = []): string
|
protected function content(array $request = []): string
|
||||||
{
|
{
|
||||||
return (new Status($this->l10n, $this->baseUrl, $this->args, $this->logger, $this->profiler, $this->response, $this->server, $this->parameters))->content();
|
return (new Status($this->mode, $this->pConfig, $this->conversation, $this->session, $this->config, $this->dateTimeFormat, $this->page, $this->app, $this->l10n, $this->baseUrl, $this->args, $this->logger, $this->profiler, $this->response, $this->server, $this->parameters))->content();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue