Improved names of entity retrieval methods

src/Api/AbstractPostJob.php

@@ -12,7 +12,7 @@ abstract class AbstractPostJob extends AbstractJob
 		else
 		{
 			$postId = $this->getArgument(self::POST_ID);
-			$this->post = PostModel::findByIdOrName($postId);
+			$this->post = PostModel::getByIdOrName($postId);
 		}
 	}
 }

src/Api/AbstractUserJob.php

@@ -12,7 +12,7 @@ abstract class AbstractUserJob extends AbstractJob
 		else
 		{
 			$userName = $this->getArgument(self::USER_NAME);
-			$this->user = UserModel::findByNameOrEmail($userName);
+			$this->user = UserModel::getByNameOrEmail($userName);
 		}
 	}
 }

src/Api/Jobs/ActivateUserEmailJob.php

@@ -7,7 +7,7 @@ class ActivateUserEmailJob extends AbstractJob
 	{
 		if (!$this->hasArgument(self::TOKEN))
 		{
-			$user = UserModel::findByNameOrEmail($this->getArgument(self::USER_NAME));
+			$user = UserModel::getByNameOrEmail($this->getArgument(self::USER_NAME));
 
 			if (empty($user->getUnconfirmedEmail()))
 			{
@@ -24,7 +24,7 @@ class ActivateUserEmailJob extends AbstractJob
 		else
 		{
 			$tokenText = $this->getArgument(self::TOKEN);
-			$token = TokenModel::findByToken($tokenText);
+			$token = TokenModel::getByToken($tokenText);
 			TokenModel::checkValidity($token);
 
 			$user = $token->getUser();

src/Api/Jobs/AddCommentJob.php

@@ -4,7 +4,7 @@ class AddCommentJob extends AbstractJob
 	public function execute()
 	{
 		$user = Auth::getCurrentUser();
-		$post = PostModel::findById($this->getArgument(self::POST_ID));
+		$post = PostModel::getById($this->getArgument(self::POST_ID));
 		$text = $this->getArgument(self::TEXT);
 
 		$comment = CommentModel::spawn();

src/Api/Jobs/DeleteCommentJob.php

@@ -5,7 +5,7 @@ class DeleteCommentJob extends AbstractJob
 
 	public function prepare()
 	{
-		$this->comment = CommentModel::findById($this->getArgument(self::COMMENT_ID));
+		$this->comment = CommentModel::getById($this->getArgument(self::COMMENT_ID));
 	}
 
 	public function execute()

src/Api/Jobs/EditCommentJob.php

@@ -5,7 +5,7 @@ class EditCommentJob extends AbstractJob
 
 	public function prepare()
 	{
-		$this->comment = CommentModel::findById($this->getArgument(self::COMMENT_ID));
+		$this->comment = CommentModel::getById($this->getArgument(self::COMMENT_ID));
 	}
 
 	public function execute()

src/Api/Jobs/GetPostContentJob.php

@@ -5,7 +5,7 @@ class GetPostContentJob extends AbstractJob
 
 	public function prepare()
 	{
-		$this->post = PostModel::findByName($this->getArgument(self::POST_NAME));
+		$this->post = PostModel::getByName($this->getArgument(self::POST_NAME));
 	}
 
 	public function execute()

src/Api/Jobs/GetPostThumbJob.php

@@ -16,7 +16,7 @@ class GetPostThumbJob extends AbstractJob
 			$path = PostModel::getThumbDefaultPath($name, $width, $height);
 			if (!file_exists($path))
 			{
-				$post = PostModel::findByIdOrName($name);
+				$post = PostModel::getByIdOrName($name);
 
 				if ($post->isHidden())
 					Access::assert(new Privilege(Privilege::ListPosts, 'hidden'));

src/Api/Jobs/PasswordResetJob.php

@@ -8,7 +8,7 @@ class PasswordResetJob extends AbstractJob
 	{
 		if (!$this->hasArgument(self::TOKEN))
 		{
-			$user = UserModel::findByNameOrEmail($this->getArgument(self::USER_NAME));
+			$user = UserModel::getByNameOrEmail($this->getArgument(self::USER_NAME));
 
 			if (empty($user->getConfirmedEmail()))
 				throw new SimpleException('This user has no e-mail confirmed; password reset cannot proceed');
@@ -20,7 +20,7 @@ class PasswordResetJob extends AbstractJob
 		else
 		{
 			$tokenText = $this->getArgument(self::TOKEN);
-			$token = TokenModel::findByToken($tokenText);
+			$token = TokenModel::getByToken($tokenText);
 			TokenModel::checkValidity($token);
 
 			$alphabet = array_merge(range('A', 'Z'), range('a', 'z'), range('0', '9'));

src/Api/Jobs/PreviewCommentJob.php

@@ -8,13 +8,13 @@ class PreviewCommentJob extends AbstractJob
 
 		if ($this->hasArgument(self::POST_ID))
 		{
-			$post = PostModel::findById($this->getArgument(self::POST_ID));
+			$post = PostModel::getById($this->getArgument(self::POST_ID));
 			$comment = CommentModel::spawn();
 			$comment->setPost($post);
 		}
 		else
 		{
-			$comment = CommentModel::findById($this->getArgument(self::COMMENT_ID));
+			$comment = CommentModel::getById($this->getArgument(self::COMMENT_ID));
 		}
 
 		$comment->setCommenter($user);

src/Api/Jobs/TogglePostTagJob.php

@@ -11,7 +11,7 @@ class TogglePostTagJob extends AbstractPostJob
 
 		if ($enable)
 		{
-			$tag = TagModel::findByName($tagName, false);
+			$tag = TagModel::tryGetByName($tagName);
 			if ($tag === null)
 			{
 				$tag = TagModel::spawn();

src/Auth.php

@@ -13,7 +13,7 @@ class Auth
 		$config = getConfig();
 		$context = getContext();
 
-		$user = UserModel::findByNameOrEmail($name, false);
+		$user = UserModel::tryGetByNameOrEmail($name);
 		if ($user === null)
 			throw new SimpleException('Invalid username');
 

src/Controllers/CommentController.php

@@ -38,7 +38,7 @@ class CommentController
 
 	public function editView($id)
 	{
-		getContext()->transport->comment = CommentModel::findById($id);
+		getContext()->transport->comment = CommentModel::getById($id);
 	}
 
 	public function editAction($id)

src/Controllers/PostController.php

@@ -69,7 +69,7 @@ class PostController
 	{
 		Access::assert(new Privilege(
 			Privilege::MassTag,
-			Access::getIdentity(PostModel::findById($id)->getUploader())));
+			Access::getIdentity(PostModel::getById($id)->getUploader())));
 
 		Api::run(
 			new TogglePostTagJob(),
@@ -121,7 +121,7 @@ class PostController
 
 	public function editAction($id)
 	{
-		$post = PostModel::findByIdOrName($id);
+		$post = PostModel::getByIdOrName($id);
 
 		$editToken = InputHelper::get('edit-token');
 		if ($editToken != $post->getEditToken())

src/Controllers/StaticPagesController.php

@@ -12,7 +12,7 @@ class StaticPagesController
 		{
 			$context->featuredPost = $featuredPost;
 			$context->featuredPostDate = PropertyModel::get(PropertyModel::FeaturedPostDate);
-			$context->featuredPostUser = UserModel::findByNameOrEmail(
+			$context->featuredPostUser = UserModel::getByNameOrEmail(
 				PropertyModel::get(PropertyModel::FeaturedPostUserName),
 				false);
 		}
@@ -48,7 +48,7 @@ class StaticPagesController
 			return PropertyModel::featureNewPost();
 
 		//check if post was deleted
-		$featuredPost = PostModel::findById($featuredPostId, false);
+		$featuredPost = PostModel::tryGetById($featuredPostId);
 		if (!$featuredPost)
 			return PropertyModel::featureNewPost();
 

src/Controllers/UserController.php

@@ -135,7 +135,7 @@ class UserController
 		Api::run(new DeleteUserJob(), [
 			DeleteUserJob::USER_NAME => $name]);
 
-		$user = UserModel::findById(Auth::getCurrentUser()->getId(), false);
+		$user = UserModel::tryGetById(Auth::getCurrentUser()->getId());
 		if (!$user)
 			Auth::logOut();
 

src/Models/AbstractCrudModel.php

@@ -23,8 +23,15 @@ abstract class AbstractCrudModel implements IModel
 	}
 
 
+	public static function getById($key)
+	{
+		$ret = self::tryGetById($key);
+		if (!$ret)
+			throw new SimpleNotFoundException('Invalid %s ID "%s"', static::getTableName(), $key);
+		return $ret;
+	}
 
-	public static function findById($key, $throw = true)
+	public static function tryGetById($key)
 	{
 		$stmt = new Sql\SelectStatement();
 		$stmt->setColumn('*');
@@ -32,15 +39,12 @@ abstract class AbstractCrudModel implements IModel
 		$stmt->setCriterion(new Sql\EqualsFunctor('id', new Sql\Binding($key)));
 
 		$row = Database::fetchOne($stmt);
-		if ($row)
+		return $row
-			return static::convertRow($row);
+			? static::convertRow($row)
-
+			: null;
-		if ($throw)
-			throw new SimpleNotFoundException('Invalid %s ID "%s"', static::getTableName(), $key);
-		return null;
 	}
 
-	public static function findByIds(array $ids)
+	public static function getAllByIds(array $ids)
 	{
 		$stmt = new Sql\SelectStatement();
 		$stmt->setColumn('*');

src/Models/CommentModel.php

@@ -56,7 +56,7 @@ final class CommentModel extends AbstractCrudModel
 
 
 
-	public static function findAllByPostId($key)
+	public static function getAllByPostId($key)
 	{
 		$stmt = new Sql\SelectStatement();
 		$stmt->setColumn('comment.*');
@@ -76,7 +76,7 @@ final class CommentModel extends AbstractCrudModel
 		self::preloadOneToMany($comments,
 			function($comment) { return $comment->getCommenterId(); },
 			function($user) { return $user->getId(); },
-			function($userIds) { return UserModel::findByIds($userIds); },
+			function($userIds) { return UserModel::getAllByIds($userIds); },
 			function($comment, $user) { return $comment->setCache('commenter', $user); });
 	}
 
@@ -85,7 +85,7 @@ final class CommentModel extends AbstractCrudModel
 		self::preloadOneToMany($comments,
 			function($comment) { return $comment->getPostId(); },
 			function($post) { return $post->getId(); },
-			function($postIds) { return PostModel::findByIds($postIds); },
+			function($postIds) { return PostModel::getAllByIds($postIds); },
 			function($comment, $post) { $comment->setCache('post', $post); });
 	}
 }

src/Models/Entities/CommentEntity.php

@@ -45,7 +45,7 @@ final class CommentEntity extends AbstractEntity implements IValidatable
 	{
 		if ($this->hasCache('post'))
 			return $this->getCache('post');
-		$post = PostModel::findById($this->getPostId());
+		$post = PostModel::getById($this->getPostId());
 		$this->setCache('post', $post);
 		return $post;
 	}
@@ -77,7 +77,7 @@ final class CommentEntity extends AbstractEntity implements IValidatable
 			return $this->getCache('commenter');
 		if (!$this->commenterId)
 			return null;
-		$user = UserModel::findById($this->commenterId, false);
+		$user = UserModel::tryGetById($this->commenterId);
 		$this->setCache('commenter', $user);
 		return $user;
 	}

src/Models/Entities/PostEntity.php

@@ -45,7 +45,7 @@ class PostEntity extends AbstractEntity implements IValidatable
 			return $this->getCache('uploader');
 		if (!$this->uploaderId)
 			return null;
-		$uploader = UserModel::findById($this->uploaderId, false);
+		$uploader = UserModel::tryGetById($this->uploaderId);
 		$this->setCache('uploader', $uploader);
 		return $uploader;
 	}
@@ -65,7 +65,7 @@ class PostEntity extends AbstractEntity implements IValidatable
 	{
 		if ($this->hasCache('comments'))
 			return $this->getCache('comments');
-		$comments = CommentModel::findAllByPostId($this->getId());
+		$comments = CommentModel::getAllByPostId($this->getId());
 		$this->setCache('comments', $comments);
 		return $comments;
 	}
@@ -139,7 +139,7 @@ class PostEntity extends AbstractEntity implements IValidatable
 					$config->browsing->maxRelatedPosts);
 			}
 
-			$relatedPosts []= PostModel::findById($relatedId);
+			$relatedPosts []= PostModel::getById($relatedId);
 		}
 
 		$this->setRelations($relatedPosts);
@@ -149,7 +149,7 @@ class PostEntity extends AbstractEntity implements IValidatable
 	{
 		if ($this->hasCache('tags'))
 			return $this->getCache('tags');
-		$tags = TagModel::findAllByPostId($this->getId());
+		$tags = TagModel::getAllByPostId($this->getId());
 		$this->setCache('tags', $tags);
 		return $tags;
 	}
@@ -400,7 +400,7 @@ class PostEntity extends AbstractEntity implements IValidatable
 				throw new SimpleException('Invalid file type "%s"', $this->getMimeType());
 		}
 
-		$duplicatedPost = PostModel::findByHash($this->getFileHash(), false);
+		$duplicatedPost = PostModel::tryGetByHash($this->getFileHash());
 		if ($duplicatedPost !== null and (!$this->getId() or $this->getId() != $duplicatedPost->getId()))
 		{
 			throw new SimpleException(
@@ -438,7 +438,7 @@ class PostEntity extends AbstractEntity implements IValidatable
 			if (file_exists($thumbPath))
 				unlink($thumbPath);
 
-			$duplicatedPost = PostModel::findByHash($youtubeId, false);
+			$duplicatedPost = PostModel::tryGetByHash($youtubeId);
 			if ($duplicatedPost !== null and (!$this->getId() or $this->getId() != $duplicatedPost->getId()))
 			{
 				throw new SimpleException(

src/Models/Entities/TokenEntity.php

@@ -43,7 +43,7 @@ class TokenEntity extends AbstractEntity implements IValidatable
 
 	public function getUser()
 	{
-		return UserModel::findById($this->userId);
+		return UserModel::getById($this->userId);
 	}
 
 	public function getUserId()

src/Models/Entities/UserEntity.php

@@ -38,7 +38,7 @@ class UserEntity extends AbstractEntity implements IValidatable
 		$userName = $this->getName();
 		$config = getConfig();
 
-		$otherUser = UserModel::findByName($userName, false);
+		$otherUser = UserModel::tryGetByName($userName);
 		if ($otherUser !== null and $otherUser->getId() != $this->getId())
 		{
 			if (!$otherUser->getConfirmedEmail()

src/Models/PostModel.php

@@ -145,7 +145,15 @@ class PostModel extends AbstractCrudModel
 
 
 
-	public static function findByName($key, $throw = true)
+	public static function getByName($key)
+	{
+		$ret = self::tryGetByName($key);
+		if (!$ret)
+			throw new SimpleNotFoundException('Invalid post name "%s"', $key);
+		return $ret;
+	}
+
+	public static function tryGetByName($key, $throw = true)
 	{
 		$stmt = new Sql\SelectStatement();
 		$stmt->setColumn('*');
@@ -153,24 +161,29 @@ class PostModel extends AbstractCrudModel
 		$stmt->setCriterion(new Sql\EqualsFunctor('name', new Sql\Binding($key)));
 
 		$row = Database::fetchOne($stmt);
-		if ($row)
+		return $row
-			return self::convertRow($row);
+			? self::convertRow($row)
-
+			: null;
-		if ($throw)
-			throw new SimpleNotFoundException('Invalid post name "%s"', $key);
-		return null;
 	}
 
-	public static function findByIdOrName($key, $throw = true)
+	public static function getByIdOrName($key)
 	{
 		if (is_numeric($key))
-			$post = self::findById($key, $throw);
+			$post = self::getById($key);
 		else
-			$post = self::findByName($key, $throw);
+			$post = self::getByName($key);
 		return $post;
 	}
 
-	public static function findByHash($key, $throw = true)
+	public static function getByHash($key)
+	{
+		$ret = self::tryGetByHash($key);
+		if (!$ret)
+			throw new SimpleNotFoundException('Invalid post hash "%s"', $hash);
+		return $ret;
+	}
+
+	public static function tryGetByHash($key)
 	{
 		$stmt = new Sql\SelectStatement();
 		$stmt->setColumn('*');
@@ -178,12 +191,9 @@ class PostModel extends AbstractCrudModel
 		$stmt->setCriterion(new Sql\EqualsFunctor('file_hash', new Sql\Binding($key)));
 
 		$row = Database::fetchOne($stmt);
-		if ($row)
+		return $row
-			return self::convertRow($row);
+			? self::convertRow($row)
-
+			: null;
-		if ($throw)
-			throw new SimpleNotFoundException('Invalid post hash "%s"', $hash);
-		return null;
 	}
 
 

src/Models/PropertyModel.php

@@ -85,6 +85,6 @@ class PropertyModel implements IModel
 		self::set(self::FeaturedPostId, $featuredPostId);
 		self::set(self::FeaturedPostDate, time());
 		self::set(self::FeaturedPostUserName, null);
-		return PostModel::findById($featuredPostId);
+		return PostModel::getById($featuredPostId);
 	}
 }

src/Models/SearchParsers/PostSearchParser.php

@@ -38,7 +38,7 @@ class PostSearchParser extends AbstractSearchParser
 		foreach ($this->tags as $item)
 		{
 			list ($tagName, $neg) = $item;
-			$tag = TagModel::findByName($tagName);
+			$tag = TagModel::getByName($tagName);
 			$innerStmt = new Sql\SelectStatement();
 			$innerStmt->setTable('post_tag');
 			$innerStmt->setCriterion((new Sql\ConjunctionFunctor)
@@ -73,7 +73,7 @@ class PostSearchParser extends AbstractSearchParser
 
 		elseif (in_array($key, ['fav', 'favs', 'favd']))
 		{
-			$user = UserModel::findByNameOrEmail($value);
+			$user = UserModel::getByNameOrEmail($value);
 			$innerStmt = (new Sql\SelectStatement)
 				->setTable('favoritee')
 				->setCriterion((new Sql\ConjunctionFunctor)
@@ -84,7 +84,7 @@ class PostSearchParser extends AbstractSearchParser
 
 		elseif (in_array($key, ['comment', 'comments', 'commenter', 'commented']))
 		{
-			$user = UserModel::findByNameOrEmail($value);
+			$user = UserModel::getByNameOrEmail($value);
 			$innerStmt = (new Sql\SelectStatement)
 				->setTable('comment')
 				->setCriterion((new Sql\ConjunctionFunctor)
@@ -95,7 +95,7 @@ class PostSearchParser extends AbstractSearchParser
 
 		elseif (in_array($key, ['submit', 'upload', 'uploads', 'uploader', 'uploaded']))
 		{
-			$user = UserModel::findByNameOrEmail($value);
+			$user = UserModel::getByNameOrEmail($value);
 			return new Sql\EqualsFunctor('post.uploader_id', new Sql\Binding($user->getId()));
 		}
 

src/Models/SearchServices/TagSearchService.php

@@ -11,7 +11,7 @@ class TagSearchService extends AbstractSearchService
 
 	public static function getRelatedTags($parentTagName)
 	{
-		$parentTagEntity = TagModel::findByName($parentTagName, false);
+		$parentTagEntity = TagModel::tryGetByName($parentTagName);
 		if (empty($parentTagEntity))
 			return [];
 		$parentTagId = $parentTagEntity->getId();

src/Models/TagModel.php

@@ -55,8 +55,8 @@ class TagModel extends AbstractCrudModel
 	{
 		Database::transaction(function() use ($sourceName, $targetName)
 		{
-			$sourceTag = TagModel::findByName($sourceName);
+			$sourceTag = TagModel::getByName($sourceName);
-			$targetTag = TagModel::findByName($targetName, false);
+			$targetTag = TagModel::tryGetByName($targetName);
 
 			if ($targetTag and $targetTag->getId() != $sourceTag->getId())
 				throw new SimpleException('Target tag already exists');
@@ -71,8 +71,8 @@ class TagModel extends AbstractCrudModel
 	{
 		Database::transaction(function() use ($sourceName, $targetName)
 		{
-			$sourceTag = TagModel::findByName($sourceName);
+			$sourceTag = TagModel::getByName($sourceName);
-			$targetTag = TagModel::findByName($targetName);
+			$targetTag = TagModel::getByName($targetName);
 
 			if ($sourceTag->getId() == $targetTag->getId())
 				throw new SimpleException('Source and target tag are the same');
@@ -116,7 +116,7 @@ class TagModel extends AbstractCrudModel
 	}
 
 
-	public static function findAllByPostId($key)
+	public static function getAllByPostId($key)
 	{
 		$stmt = new Sql\SelectStatement();
 		$stmt->setColumn('tag.*');
@@ -130,7 +130,15 @@ class TagModel extends AbstractCrudModel
 		return [];
 	}
 
-	public static function findByName($key, $throw = true)
+	public static function getByName($key)
+	{
+		$ret = self::tryGetByName($key);
+		if (!$ret)
+			throw new SimpleNotFoundException('Invalid tag name "%s"', $key);
+		return $ret;
+	}
+
+	public static function tryGetByName($key)
 	{
 		$stmt = new Sql\SelectStatement();
 		$stmt->setColumn('tag.*');
@@ -138,12 +146,9 @@ class TagModel extends AbstractCrudModel
 		$stmt->setCriterion(new Sql\NoCaseFunctor(new Sql\EqualsFunctor('name', new Sql\Binding($key))));
 
 		$row = Database::fetchOne($stmt);
-		if ($row)
+		return $row
-			return self::convertRow($row);
+			? self::convertRow($row)
-
+			: null;
-		if ($throw)
-			throw new SimpleNotFoundException('Invalid tag name "%s"', $key);
-		return null;
 	}
 
 
@@ -166,7 +171,7 @@ class TagModel extends AbstractCrudModel
 		$tags = [];
 		foreach ($tagNames as $tagName)
 		{
-			$tag = TagModel::findByName($tagName, false);
+			$tag = TagModel::tryGetByName($tagName);
 			if (!$tag)
 			{
 				$tag = TagModel::spawn();

src/Models/TokenModel.php

@@ -37,7 +37,15 @@ class TokenModel extends AbstractCrudModel
 		return $token;
 	}
 
-	public static function findByToken($key, $throw = true)
+	public static function getByToken($key)
+	{
+		$ret = self::tryGetByToken($key);
+		if (!$ret)
+			throw new SimpleNotFoundException('No user with such security token');
+		return $ret;
+	}
+
+	public static function tryGetByToken($key)
 	{
 		if (empty($key))
 			throw new SimpleNotFoundException('Invalid security token');
@@ -48,12 +56,9 @@ class TokenModel extends AbstractCrudModel
 		$stmt->setCriterion(new Sql\EqualsFunctor('token', new Sql\Binding($key)));
 
 		$row = Database::fetchOne($stmt);
-		if ($row)
+		return $row
-			return self::convertRow($row);
+			? self::convertRow($row)
-
+			: null;
-		if ($throw)
-			throw new SimpleNotFoundException('No user with such security token');
-		return null;
 	}
 
 	public static function checkValidity($token)
@@ -74,7 +79,7 @@ class TokenModel extends AbstractCrudModel
 		while (true)
 		{
 			$tokenText =  md5(mt_rand() . uniqid());
-			$token = self::findByToken($tokenText, false);
+			$token = self::tryGetByToken($tokenText);
 			if (!$token)
 				return $tokenText;
 		}

src/Models/UserModel.php

@@ -101,7 +101,15 @@ class UserModel extends AbstractCrudModel
 
 
 
-	public static function findByName($key, $throw = true)
+	public static function getByName($key)
+	{
+		$ret = self::tryGetByName($key);
+		if (!$ret)
+			throw new SimpleNotFoundException('Invalid user name "%s"', $key);
+		return $ret;
+	}
+
+	public static function tryGetByName($key)
 	{
 		$stmt = new Sql\SelectStatement();
 		$stmt->setColumn('*');
@@ -109,15 +117,20 @@ class UserModel extends AbstractCrudModel
 		$stmt->setCriterion(new Sql\NoCaseFunctor(new Sql\EqualsFunctor('name', new Sql\Binding(trim($key)))));
 
 		$row = Database::fetchOne($stmt);
-		if ($row)
+		return $row
-			return self::convertRow($row);
+			? self::convertRow($row)
-
+			: null;
-		if ($throw)
-			throw new SimpleNotFoundException('Invalid user name "%s"', $key);
-		return null;
 	}
 
-	public static function findByNameOrEmail($key, $throw = true)
+	public static function getByNameOrEmail($key)
+	{
+		$ret = self::tryGetByNameOrEmail($key);
+		if (!$ret)
+			throw new SimpleNotFoundException('Invalid user name "%s"', $key);
+		return $ret;
+	}
+
+	public static function tryGetByNameOrEmail($key)
 	{
 		$key = trim($key);
 
@@ -130,12 +143,9 @@ class UserModel extends AbstractCrudModel
 			->add(new Sql\NoCaseFunctor(new Sql\EqualsFunctor('email_confirmed', new Sql\Binding($key)))));
 
 		$row = Database::fetchOne($stmt);
-		if ($row)
+		return $row
-			return self::convertRow($row);
+			? self::convertRow($row)
-
+			: null;
-		if ($throw)
-			throw new SimpleNotFoundException('Invalid user name "%s"', $key);
-		return null;
 	}
 
 

tests/JobTests/ActivateUserEmailJobTest.php

@@ -25,7 +25,7 @@ class ActivateUserEmailJobTest extends AbstractTest
 
 		$tokens = Mailer::getMailsSent()[0]->tokens;
 		$tokenText = $tokens['token'];
-		$token = TokenModel::findByToken($tokenText);
+		$token = TokenModel::getByToken($tokenText);
 
 		$this->assert->areEqual($user->getId(), $token->getUser()->getId());
 		$this->assert->isTrue(strpos($tokens['link'], $tokenText) !== false);
@@ -66,7 +66,7 @@ class ActivateUserEmailJobTest extends AbstractTest
 		});
 
 		//reload local entity after changes done by the job
-		$user = UserModel::findById($user->getId());
+		$user = UserModel::getById($user->getId());
 
 		$this->assert->areEqual(null, $user->getUnconfirmedEmail());
 		$this->assert->areEqual('godzilla@whitestar.gov', $user->getConfirmedEmail());
@@ -139,8 +139,8 @@ class ActivateUserEmailJobTest extends AbstractTest
 		$token2text = $tokens2['token'];
 		$this->assert->areNotEqual($token1text, $token2text);
 
-		$token1 = TokenModel::findByToken($token1text);
+		$token1 = TokenModel::getByToken($token1text);
-		$token2 = TokenModel::findByToken($token2text);
+		$token2 = TokenModel::getByToken($token2text);
 
 		$this->assert->areEqual($user1->getId(), $token1->getUser()->getId());
 		$this->assert->areEqual($user2->getId(), $token2->getUser()->getId());

tests/JobTests/AddCommentJobTest.php

@@ -20,7 +20,7 @@ class AddCommentJobTest extends AbstractTest
 		$this->assert->isNotNull($comment->getCreationTime());
 		$this->assert->doesNotThrow(function() use ($comment)
 		{
-			CommentModel::findById($comment->getId());
+			CommentModel::getById($comment->getId());
 		});
 	}
 

tests/JobTests/AddUserJobTest.php

@@ -298,8 +298,8 @@ class AddUserJobTest extends AbstractTest
 		$token2text = Mailer::getMailsSent()[1]->tokens['token'];
 		$this->assert->areNotEqual($token1text, $token2text);
 
-		$token1 = TokenModel::findByToken($token1text);
+		$token1 = TokenModel::getByToken($token1text);
-		$token2 = TokenModel::findByToken($token2text);
+		$token2 = TokenModel::getByToken($token2text);
 
 		$this->assert->areEqual($user1->getId(), $token1->getUser()->getId());
 		$this->assert->areEqual($user2->getId(), $token2->getUser()->getId());

tests/JobTests/EditCommentJobTest.php

@@ -18,7 +18,7 @@ class EditCommentJobTest extends AbstractTest
 		$this->assert->isNotNull($comment->getCreationTime());
 		$this->assert->doesNotThrow(function() use ($comment)
 		{
-			CommentModel::findById($comment->getId());
+			CommentModel::getById($comment->getId());
 		});
 	}
 

tests/JobTests/EditPostContentJobTest.php

@@ -8,7 +8,7 @@ class EditPostContentJobTest extends AbstractTest
 		$post = $this->uploadFromFile('image.jpg');
 		$this->assert->doesNotThrow(function() use ($post)
 		{
-			PostModel::findById($post->getId());
+			PostModel::getById($post->getId());
 		});
 	}
 
@@ -74,7 +74,7 @@ class EditPostContentJobTest extends AbstractTest
 		$post = $this->uploadFromUrl('image.jpg');
 		$this->assert->doesNotThrow(function() use ($post)
 		{
-			PostModel::findById($post->getId());
+			PostModel::getById($post->getId());
 		});
 	}
 
@@ -99,7 +99,7 @@ class EditPostContentJobTest extends AbstractTest
 
 		$this->assert->doesNotThrow(function() use ($post)
 		{
-			PostModel::findById($post->getId());
+			PostModel::getById($post->getId());
 		});
 	}
 

tests/JobTests/EditPostSourceJobTest.php

@@ -13,7 +13,7 @@ class EditPostSourceJobTest extends AbstractTest
 		$this->assert->areEqual('a', $post->getSource());
 		$this->assert->doesNotThrow(function() use ($post)
 		{
-			PostModel::findById($post->getId());
+			PostModel::getById($post->getId());
 		});
 	}
 

tests/JobTests/ListCommentsJobTest.php

@@ -26,7 +26,7 @@ class ListCommentJobTest extends AbstractTest
 		$post = $ret->entities[0];
 		$samePost = $this->assert->doesNotThrow(function() use ($post)
 		{
-			return PostModel::findById($post->getId());
+			return PostModel::getById($post->getId());
 		});
 		//posts retrieved via ListCommentsJob should already have cached its comments
 		$this->assert->areNotEquivalent($post, $samePost);

tests/JobTests/PreviewCommentJobTest.php

@@ -17,7 +17,7 @@ class PreviewCommentJobTest extends AbstractTest
 		$this->assert->isNotNull($comment->getCreationTime());
 		$this->assert->throws(function() use ($comment)
 		{
-			CommentModel::findById($comment->getId());
+			CommentModel::getById($comment->getId());
 		}, 'Invalid comment ID');
 	}