github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-01 12:00:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove unnecessary indirection

Browse Source
This commit is contained in:
Franz Liedke 2019-08-20 17:39:55 +02:00
parent 279c7df9b9
commit 0836d99e83
No known key found for this signature in database
GPG Key ID: 9A0231A879B055F4
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/User/AssertPermissionTrait.php
View File

@ -35,18 +35,18 @@ trait AssertPermissionTrait
} }
/** /**
* Ensure the current user is authenticated. * Ensure the given actor is authenticated.
* *
* This will throw an exception for guest users, signaling that * This will throw an exception for guest users, signaling that
* *authorization* failed. Thus, they could retry the operation after * *authorization* failed. Thus, they could retry the operation after
* logging in (or using other means of authentication). * logging in (or using other means of authentication).
* *
* @param bool $condition * @param User $actor
* @throws NotAuthenticatedException * @throws NotAuthenticatedException
*/ */
protected function assertAuthentication($condition) protected function assertRegistered(User $actor)
{ {
if (! $condition) { if ($actor->isGuest()) {
throw new NotAuthenticatedException; throw new NotAuthenticatedException;
} }
} }
@ -62,15 +62,6 @@ trait AssertPermissionTrait
$this->assertPermission($actor->can($ability, $arguments)); $this->assertPermission($actor->can($ability, $arguments));
} }
/**
* @param User $actor
* @throws NotAuthenticatedException
*/
protected function assertRegistered(User $actor)
{
$this->assertAuthentication(! $actor->isGuest());
}
/** /**
* @param User $actor * @param User $actor
* @throws PermissionDeniedException * @throws PermissionDeniedException