Some more renamed functions

diff --git a/src/App.php b/src/App.php
index 69167e98f1ceee4e64b340f346074500a5e9cc1e..6e9f7c3184389e9055f5369b4921544c2d947b76 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -132,7 +132,7 @@ class App
         * @param int $user_id
         * @return void
         */
-       public function setUserId(int $user_id)
+       public function setLoggedInUserId(int $user_id)
        {
                $this->user_id = $user_id;
        }
@@ -143,7 +143,7 @@ class App
         * @param int $user_id
         * @return void
         */
-       public function setNickname(string $nickname)
+       public function setLoggedInUserNickname(string $nickname)
        {
                $this->nickname = $nickname;
        }

diff --git a/src/Security/Authentication.php b/src/Security/Authentication.php
index 074cfc2bae0c733013b59440241da4bc836978fc..e894c6ddaf776fbe3e925fc7d98b290c53b44f80 100644 (file)
--- a/src/Security/Authentication.php
+++ b/src/Security/Authentication.php
@@ -352,8 +352,8 @@ class Authentication
                        }
                }
 
-               $a->setUserId($user_record['uid']);
-               $a->setNickname($user_record['nickname']);
+               $a->setLoggedInUserId($user_record['uid']);
+               $a->setLoggedInUserNickname($user_record['nickname']);
 
                if ($login_initial) {
                        Hook::callAll('logged_in', $user_record);

diff --git a/tests/legacy/ApiTest.php b/tests/legacy/ApiTest.php
index 2e6d49ebf2320622d52617e48edc22553709775e..eaf596fb6ab4b711ec7382f6dd24687cf09021dd 100644 (file)
--- a/tests/legacy/ApiTest.php
+++ b/tests/legacy/ApiTest.php
@@ -1949,7 +1949,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiStatusesMentions()
        {
-               $this->app->setNickname($this->selfUser['nick']);
+               $this->app->setLoggedInUserNickname($this->selfUser['nick']);
                $_REQUEST['max_id'] = 10;
                $result             = api_statuses_mentions('json');
                self::assertEmpty($result['status']);
@@ -2865,7 +2865,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiDirectMessagesNewWithScreenName()
        {
-               $this->app->setNickname($this->selfUser['nick']);
+               $this->app->setLoggedInUserNickname($this->selfUser['nick']);
                $_POST['text']        = 'message_text';
                $_POST['screen_name'] = $this->friendUser['nick'];
                $result               = api_direct_messages_new('json');
@@ -2881,7 +2881,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiDirectMessagesNewWithTitle()
        {
-               $this->app->setNickname($this->selfUser['nick']);
+               $this->app->setLoggedInUserNickname($this->selfUser['nick']);
                $_POST['text']        = 'message_text';
                $_POST['screen_name'] = $this->friendUser['nick'];
                $_REQUEST['title']    = 'message_title';
@@ -2899,7 +2899,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiDirectMessagesNewWithRss()
        {
-               $this->app->setNickname($this->selfUser['nick']);
+               $this->app->setLoggedInUserNickname($this->selfUser['nick']);
                $_POST['text']        = 'message_text';
                $_POST['screen_name'] = $this->friendUser['nick'];
                $result               = api_direct_messages_new('rss');