From eedde86a373f76f4d9cee861e3740c1a6e144036 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 12 Nov 2022 08:37:42 -0500 Subject: [PATCH] Remove superfluous property declaration in Settings\UserExport - Address https://github.com/friendica/friendica/issues/11992#issuecomment-1312417007 --- src/Module/Settings/RemoveMe.php | 3 +-- src/Module/Settings/UserExport.php | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/Module/Settings/RemoveMe.php b/src/Module/Settings/RemoveMe.php index 09365ed7b7..87bc6152a5 100644 --- a/src/Module/Settings/RemoveMe.php +++ b/src/Module/Settings/RemoveMe.php @@ -51,11 +51,10 @@ class RemoveMe extends BaseSettings /** @var Cookie */ private $cookie; - public function __construct(Cookie $cookie, SystemMessages $systemMessages, Emailer $emailer, Database $database, IManageConfigValues $config, App\Page $page, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + public function __construct(Cookie $cookie, SystemMessages $systemMessages, Emailer $emailer, Database $database, IManageConfigValues $config, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) { parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); - $this->session = $session; $this->config = $config; $this->database = $database; $this->emailer = $emailer; diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php index 85e1f75c65..7848965eee 100644 --- a/src/Module/Settings/UserExport.php +++ b/src/Module/Settings/UserExport.php @@ -47,17 +47,13 @@ use Psr\Log\LoggerInterface; **/ class UserExport extends BaseSettings { - /** @var IHandleUserSessions */ - private $session; - /** @var DbaDefinition */ private $dbaDefinition; - public function __construct(DbaDefinition $dbaDefinition, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + public function __construct(DbaDefinition $dbaDefinition, IHandleUserSessions $session, App\Page $page, 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); + parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); - $this->session = $session; $this->dbaDefinition = $dbaDefinition; } -- 2.39.5