diff --git a/core/modules/user/lib/Drupal/user/Access/RoleAccessCheck.php b/core/modules/user/lib/Drupal/user/Access/RoleAccessCheck.php index 507a829..3541168 100644 --- a/core/modules/user/lib/Drupal/user/Access/RoleAccessCheck.php +++ b/core/modules/user/lib/Drupal/user/Access/RoleAccessCheck.php @@ -17,14 +17,15 @@ class RoleAccessCheck implements AccessCheckInterface { /** - * Implements AccessCheckInterface::applies(). + * {@inheritdoc} */ public function applies(Route $route) { return array_key_exists('_role', $route->getRequirements()); } + /** - * Implements AccessCheckInterface::access(). + * {@inheritdoc} */ public function access(Route $route, Request $request) { // Requirements just allow strings, so this might be a comma separated list. diff --git a/core/tests/Drupal/Tests/Core/Route/RouterRoleTest.php b/core/tests/Drupal/Tests/Core/Route/RouterRoleTest.php index 1c786cc..9f9f73b 100644 --- a/core/tests/Drupal/Tests/Core/Route/RouterRoleTest.php +++ b/core/tests/Drupal/Tests/Core/Route/RouterRoleTest.php @@ -52,7 +52,7 @@ protected function getTestRouteCollection() { $route_collection = new RouteCollection(); $route_collection->add('role_test_1', new Route('/role_test_1', array( - '_controller' => '\Drupal\router_test\TestControllers::test1' + '_controller' => '\Drupal\router_test\TestControllers::test1', ), array( '_role' => 'role_test_1', @@ -60,7 +60,7 @@ protected function getTestRouteCollection() { )); $route_collection->add('role_test_2', new Route('/role_test_2', array( - '_controller' => '\Drupal\router_test\TestControllers::test1' + '_controller' => '\Drupal\router_test\TestControllers::test1', ), array( '_role' => 'role_test_2', @@ -68,7 +68,7 @@ protected function getTestRouteCollection() { )); $route_collection->add('role_test_3', new Route('/role_test_3', array( - '_controller' => '\Drupal\router_test\TestControllers::test1' + '_controller' => '\Drupal\router_test\TestControllers::test1', ), array( '_role' => 'role_test_1, role_test_2', @@ -123,8 +123,7 @@ public function testRoleAccessProvider() { * @return array * All users which are not granted. */ - public function accountsToDeny($grant_users) { -// return array_diff_assoc($this->accounts, $grant_users); + protected function accountsToDeny($grant_users) { return array_filter($this->accounts, function($account) use ($grant_users) { foreach ($grant_users as $grant_user) { if ($account == $grant_user) { @@ -138,6 +137,13 @@ public function accountsToDeny($grant_users) { /** * Tests role requirements on routes. * + * @param string $path + * The path to check access for. + * @param array $grant_accounts + * A list of accounts which should have access to the given path. + * + * @see \Drupal\Tests\Core\Route\RouterRoleTest::getTestRouteCollection + * * @dataProvider testRoleAccessProvider */ public function testRoleAccess($path, $grant_accounts) {