From 18235e69258638f8c71c93b73542b391f9b41ce1 Mon Sep 17 00:00:00 2001 From: Kamil Madejski Date: Mon, 12 Mar 2018 15:33:43 +0100 Subject: [PATCH] EZP-28926: Add validation for PermissionResolver::hasAccess(module, function) arguments (#2273) * [WIP][6.7] Add validation for hasAccess(module, function) arguments To avoid issues such as https://github.com/ezsystems/ezplatform-admin-ui/pull/358 Todo: - Find a way to move `eZ/Bundle/EzPublishCoreBundle/Resources/config/policies.yml` into core and reuse across Core and CoreBundle to get rid of the internal hard coded policy map. - Unit tests, some failing with `Argument 'module' is invalid: 'module: test-module/ function: test-function' is wrong value` * EZP-28926: Add validation for PermissionResolver::hasAccess(module, function) arguments * CS fix * Added missing empty line * Updated specification * Added deprecated info * fixup! Added missing empty line * Improved test code quality --- Repository/PermissionResolver.php | 2 ++ Repository/Repository.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Repository/PermissionResolver.php b/Repository/PermissionResolver.php index 0efb3de96..36b185e4a 100644 --- a/Repository/PermissionResolver.php +++ b/Repository/PermissionResolver.php @@ -34,6 +34,8 @@ public function setCurrentUserReference(UserReference $userReference); * * Note: boolean value describes full access (true) or no access at all (false). * + * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException If module or function is invalid. + * * @param string $module The module, aka controller identifier to check permissions on * @param string $function The function, aka the controller action to check permissions on * @param \eZ\Publish\API\Repository\Values\User\UserReference|null $userReference User for diff --git a/Repository/Repository.php b/Repository/Repository.php index 93c963bdf..588c2fba5 100644 --- a/Repository/Repository.php +++ b/Repository/Repository.php @@ -47,6 +47,8 @@ public function setCurrentUser(UserReference $user); /** * @deprecated since 6.6, to be removed. Use PermissionResolver::hasAccess() instead. * + * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException If module or function is invalid. + * * @param string $module The module, aka controller identifier to check permissions on * @param string $function The function, aka the controller action to check permissions on * @param \eZ\Publish\API\Repository\Values\User\UserReference $user