implement feeback

diff --git a/src/App.php b/src/App.php
index c91ca4c4f29f40ff5d4617d74d7c1ba5dde8d141..27eaf100f490e7908abcea41d6e96695320cd060 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -334,9 +334,9 @@ class App
         * @param L10n                        $l10n     The translator instance
         * @param App\Arguments               $args     The Friendica Arguments of the call
         * @param IManagePersonalConfigValues $pConfig  Personal configuration
-        * @param IHandleUserSessions         $sessions The (User)Session handler
+        * @param IHandleUserSessions         $session  The (User)Session handler
         */
-       public function __construct(Database $database, IManageConfigValues $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, IManagePersonalConfigValues $pConfig, IHandleUserSessions $sessions)
+       public function __construct(Database $database, IManageConfigValues $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, IManagePersonalConfigValues $pConfig, IHandleUserSessions $session)
        {
                $this->database = $database;
                $this->config   = $config;
@@ -347,7 +347,7 @@ class App
                $this->l10n     = $l10n;
                $this->args     = $args;
                $this->pConfig  = $pConfig;
-               $this->session  = $sessions;
+               $this->session  = $session;
 
                $this->load();
        }

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index a3bdecc3f950f5c97e8f780bd72ef72d1eabbab5..7773cdd508ea258dc31f7806db3adb27c8c26da7 100644 (file)
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -500,7 +500,7 @@ class Conversation
 
                        if (!$update) {
                                $live_update_div = '<div id="live-display"></div>' . "\r\n"
-                                       . "<script> var profile_uid = " . $this->session->getLocalUserId() ?? 0 . ";"
+                                       . "<script> var profile_uid = " . ($this->session->getLocalUserId() ?: 0) . ";"
                                        . "</script>";
                        }
                } elseif ($mode === 'community') {

diff --git a/src/Module/Security/Logout.php b/src/Module/Security/Logout.php
index e50599407b9e395a94cd650df1859760eca2da32..528dd295e7592eaa6834de89149cbd5b0114d103 100644 (file)
--- a/src/Module/Security/Logout.php
+++ b/src/Module/Security/Logout.php
@@ -44,8 +44,7 @@ class Logout extends BaseModule
        protected $cache;
        /** @var Cookie */
        protected $cookie;
-       /** @var IHandleUserSessions
-        */
+       /** @var IHandleUserSessions */
        protected $session;
 
        public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, ICanCache $cache, Cookie $cookie, IHandleUserSessions $session, array $server, array $parameters = [])