Merge pull request #12050 from nupplaphil/bug/notf_session_fix

Fix missing/wrong IHandleUserSessions usages

diff --git a/src/Module/Notifications/Introductions.php b/src/Module/Notifications/Introductions.php
index 5b6ccc7452d51818fdf4d4a4942ce7b4cc243b0e..2bd03e3071784772e472d950ad7a5af115d1003d 100644 (file)
--- a/src/Module/Notifications/Introductions.php
+++ b/src/Module/Notifications/Introductions.php
@@ -30,6 +30,7 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\DI;
 use Friendica\Model\User;
 use Friendica\Module\BaseNotifications;
@@ -49,9 +50,9 @@ class Introductions extends BaseNotifications
        /** @var Mode */
        protected $mode;
 
-       public function __construct(L10n $l10n, App\BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Mode $mode, IntroductionFactory $notificationIntro, array $server, array $parameters = [])
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Mode $mode, IntroductionFactory $notificationIntro, IHandleUserSessions $userSession, array $server, array $parameters = [])
        {
-               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $userSession, $server, $parameters);
 
                $this->notificationIntro = $notificationIntro;
                $this->mode              = $mode;

diff --git a/src/Module/Notifications/Notifications.php b/src/Module/Notifications/Notifications.php
index 90ea9c28ba53fdccb85f79a620a84e531e220373..34d3cc698c1612d2e61e988a7d0228e2e17d993a 100644 (file)
--- a/src/Module/Notifications/Notifications.php
+++ b/src/Module/Notifications/Notifications.php
@@ -26,6 +26,7 @@ use Friendica\App\Arguments;
 use Friendica\Content\Nav;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Module\BaseNotifications;
 use Friendica\Module\Response;
 use Friendica\Navigation\Notifications\ValueObject\FormattedNotify;
@@ -44,9 +45,9 @@ class Notifications extends BaseNotifications
        /** @var \Friendica\Navigation\Notifications\Factory\FormattedNotify */
        protected $formattedNotifyFactory;
 
-       public function __construct(L10n $l10n, App\BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, \Friendica\Navigation\Notifications\Factory\FormattedNotify $formattedNotifyFactory, array $server, array $parameters = [])
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, \Friendica\Navigation\Notifications\Factory\FormattedNotify $formattedNotifyFactory, IHandleUserSessions $userSession, array $server, array $parameters = [])
        {
-               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $userSession, $server, $parameters);
 
                $this->formattedNotifyFactory = $formattedNotifyFactory;
        }

diff --git a/src/Module/ParseUrl.php b/src/Module/ParseUrl.php
index fc096bbd585bf09fd62aa98157ef7ee605347011..8353cdf6d6713a9cb2bff393b8fcc98f36d7fcf0 100644 (file)
--- a/src/Module/ParseUrl.php
+++ b/src/Module/ParseUrl.php
@@ -38,7 +38,7 @@ class ParseUrl extends BaseModule
        /** @var IHandleUserSessions */
        protected $userSession;
 
-       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Session\Capability\IHandleUserSessions $userSession, $server, array $parameters = [])
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $userSession, $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);