Fix regression with user id set to '0'

Author: carlbennett

src/libraries/Comment.php

@@ -211,7 +211,8 @@ public function getParentUrl() {
   }
 
   public function getUser() {
-    return User::findUserById($this->user_id);
+    if (is_null($this->user_id)) return null;
+    return new User($this->user_id);
   }
 
   public function getUserId() {

src/libraries/Document.php

@@ -282,7 +282,8 @@ public function getURI() {
   }
 
   public function getUser() {
-    return User::findUserById($this->user_id);
+    if (is_null($this->user_id)) return null;
+    return new User($this->user_id);
   }
 
   public function getUserId() {
@@ -309,7 +310,7 @@ protected static function normalize(StdClass &$data) {
       $data->edited_datetime = $data->edited_datetime;
 
     if (!is_null($data->user_id))
-      $data->user_id = $data->user_id;
+      $data->user_id = (int) $data->user_id;
 
     return true;
   }

src/libraries/NewsPost.php

@@ -315,7 +315,8 @@ public function getURI() {
   }
 
   public function getUser() {
-    return User::findUserById($this->user_id);
+    if (is_null($this->user_id)) return null;
+    return new User($this->user_id);
   }
 
   public function getUserId() {

src/libraries/Packet.php

@@ -531,7 +531,8 @@ public function getUsedBy() {
   }
 
   public function getUser() {
-    return User::findUserById($this->user_id);
+    if (is_null($this->user_id)) return null;
+    return new User($this->user_id);
   }
 
   public function getUserId() {
@@ -590,7 +591,7 @@ protected static function normalize( StdClass &$data ) {
       $data->edited_datetime = $data->edited_datetime;
 
     if (!is_null($data->user_id))
-      $data->user_id = $data->user_id;
+      $data->user_id = (int) $data->user_id;
 
     return true;
   }

src/libraries/Server.php

@@ -204,7 +204,8 @@ public function getUpdatedDateTime() {
   }
 
   public function getUser() {
-    return User::findUserById($this->user_id);
+    if (is_null($this->user_id)) return null;
+    return new User($this->user_id);
   }
 
   public function getUserId() {

src/libraries/User.php

@@ -122,7 +122,7 @@ public function allocate()
     $this->setOptions(self::DEFAULT_OPTION);
     $this->setTimezone(self::DEFAULT_TZ);
 
-    if (empty($id)) return;
+    if (is_null($id)) return;
 
     if (!isset(Common::$database))
     {
@@ -368,20 +368,6 @@ public static function generateVerifierToken(string $username, string $email)
     return hash('sha256', $digest);
   }
 
-  public static function findUserById(?int $user_id)
-  {
-    if (is_null($user_id)) return null;
-
-    try
-    {
-      return new User($user_id);
-    }
-    catch (UserNotFoundException $e)
-    {
-      return null;
-    }
-  }
-
   public static function &getAllUsers($order = null, $limit = null, $index = null)
   {
     if (!(is_numeric($limit) || is_numeric($index))) {
@@ -479,7 +465,7 @@ public function getId()
 
   public function getName()
   {
-    return (is_null($this->display_name) ? $this->username : $this->display_name);
+    return $this->display_name ?? $this->username;
   }
 
   public function getOption(int $option)
@@ -511,9 +497,16 @@ public function getPasswordSalt()
 
   public function getURI()
   {
-    return Common::relativeUrlToAbsolute(
-      '/user/' . $this->getId() . '/' . Common::sanitizeForUrl($this->getName(), true)
-    );
+    $id = $this->getId();
+
+    if (is_null($id))
+    {
+      throw new UnexpectedValueException('user id is null');
+    }
+
+    return Common::relativeUrlToAbsolute(sprintf(
+      '/user/%s/%s', $id, Common::sanitizeForUrl($this->getName(), true)
+    ));
   }
 
   public static function getUserCount()