[core] User::get_anonymous() function

Author: shish

core/Testing/ShimmiePHPUnitTestCase.php

@@ -238,7 +238,7 @@ protected static function log_in_as_user(): void
 
     protected static function log_out(): void
     {
-        send_event(new UserLoginEvent(User::by_id(Ctx::$config->req(UserAccountsConfig::ANON_ID))));
+        send_event(new UserLoginEvent(User::get_anonymous()));
     }
 
     // post things

core/User/User.php

@@ -182,6 +182,10 @@ public static function by_name_and_pass(string $name, string $pass): User
         }
     }
 
+    public static function get_anonymous(): User
+    {
+        return User::by_id(Ctx::$config->req(UserAccountsConfig::ANON_ID));
+    }
 
     /* useful user object functions start here */
 

core/Util/util.php

@@ -331,7 +331,7 @@ function _get_user(): User
         $my_user = User::by_session(Ctx::$page->get_cookie("user"), Ctx::$page->get_cookie("session"));
     }
     if (is_null($my_user)) {
-        $my_user = User::by_id(Ctx::$config->req(UserAccountsConfig::ANON_ID));
+        $my_user = User::get_anonymous();
     }
 
     return $my_user;

ext/danbooru_api/main.php

@@ -78,7 +78,7 @@ private function authenticate_user(PageRequestEvent $event): void
                 $pass = $event->POST->req('password');
                 Ctx::$user = User::by_name_and_pass($name, $pass);
             } catch (UserNotFound $e) {
-                Ctx::$user = User::by_id(Ctx::$config->req(UserAccountsConfig::ANON_ID));
+                Ctx::$user = User::get_anonymous();
             }
             send_event(new UserLoginEvent(Ctx::$user));
         }

ext/ouroboros_api/main.php

@@ -556,15 +556,15 @@ private function tryAuth(): void
             //Auth by session data from query
             $name = $_REQUEST['user'];
             $session = $_REQUEST['session'];
-            $user = User::by_session($name, $session) ?? User::by_id(Ctx::$config->req(UserAccountsConfig::ANON_ID));
+            $user = User::by_session($name, $session) ?? User::get_anonymous();
             send_event(new UserLoginEvent($user));
         } elseif (isset($_COOKIE[SysConfig::getCookiePrefix() . '_' . 'session']) &&
             isset($_COOKIE[SysConfig::getCookiePrefix() . '_' . 'user'])
         ) {
             //Auth by session data from cookies
             $session = $_COOKIE[SysConfig::getCookiePrefix() . '_' . 'session'];
             $user = $_COOKIE[SysConfig::getCookiePrefix() . '_' . 'user'];
-            $user = User::by_session($user, $session) ?? User::by_id(Ctx::$config->req(UserAccountsConfig::ANON_ID));
+            $user = User::by_session($user, $session) ?? User::get_anonymous();
             send_event(new UserLoginEvent($user));
         }
     }

ext/user/main.php

@@ -92,7 +92,7 @@ public static function login(string $username, string $password): LoginResult
             );
         } catch (UserNotFound $ex) {
             return new LoginResult(
-                User::by_id(Ctx::$config->req(UserAccountsConfig::ANON_ID)),
+                User::get_anonymous(),
                 null,
                 "No user found"
             );
@@ -111,7 +111,7 @@ public static function create_user(string $username, string $password1, string $
             );
         } catch (UserCreationException $ex) {
             return new LoginResult(
-                User::by_id(Ctx::$config->req(UserAccountsConfig::ANON_ID)),
+                User::get_anonymous(),
                 null,
                 $ex->getMessage()
             );

tests/bootstrap.php

@@ -50,7 +50,7 @@
 Ctx::setEventBus(new EventBus());
 send_event(new DatabaseUpgradeEvent());
 send_event(new InitExtEvent());
-Ctx::setUser(User::by_id(Ctx::$config->req(UserAccountsConfig::ANON_ID)));
+Ctx::setUser(User::get_anonymous());
 $userPage = new UserPage();
 $userPage->onUserCreation(new UserCreationEvent("demo", "demo", "demo", "[email protected]", false));
 $userPage->onUserCreation(new UserCreationEvent("test", "test", "test", "[email protected]", false));