From 0836d99e831ab3c08bbfb2fc1312367bf34ad6dd Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Tue, 20 Aug 2019 17:39:55 +0200 Subject: [PATCH] Remove unnecessary indirection --- src/User/AssertPermissionTrait.php | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/User/AssertPermissionTrait.php b/src/User/AssertPermissionTrait.php index 2ba07ee87..d3e1ad709 100644 --- a/src/User/AssertPermissionTrait.php +++ b/src/User/AssertPermissionTrait.php @@ -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 * *authorization* failed. Thus, they could retry the operation after * logging in (or using other means of authentication). * - * @param bool $condition + * @param User $actor * @throws NotAuthenticatedException */ - protected function assertAuthentication($condition) + protected function assertRegistered(User $actor) { - if (! $condition) { + if ($actor->isGuest()) { throw new NotAuthenticatedException; } } @@ -62,15 +62,6 @@ trait AssertPermissionTrait $this->assertPermission($actor->can($ability, $arguments)); } - /** - * @param User $actor - * @throws NotAuthenticatedException - */ - protected function assertRegistered(User $actor) - { - $this->assertAuthentication(! $actor->isGuest()); - } - /** * @param User $actor * @throws PermissionDeniedException