diff -u b/core/modules/user/tests/modules/user_access_test/user_access_test.module b/core/modules/user/tests/modules/user_access_test/user_access_test.module --- b/core/modules/user/tests/modules/user_access_test/user_access_test.module +++ b/core/modules/user/tests/modules/user_access_test/user_access_test.module @@ -20,19 +20,19 @@ // Deny edit access. $access = AccessResult::forbidden(); } - if ($entity->getAccountName() == "no_delete" && $operation == "delete") { + else if ($entity->getAccountName() == "no_delete" && $operation == "delete") { // Deny delete access. $access = AccessResult::forbidden(); } - // Account with role sub-admin can manage users with no roles. - if (count($entity->getRoles()) == 1) { - return AccessResult::allowedIfHasPermission($account, 'sub-admin'); + else if (count($entity->getRoles()) == 1) { + $access = AccessResult::allowedIfHasPermission($account, 'sub-admin'); } - if ($entity->getAccountName() == "no_view_label" && $operation == "view label") { + else if ($entity->getAccountName() == "no_view_label" && $operation == "view label") { // Deny view label access. $access = AccessResult::forbidden(); } + if (isset($entity->testAccessAddCacheTags)) { $access->addCacheTags($entity->testAccessAddCacheTags); } diff -u b/core/modules/user/tests/src/Kernel/UserTemplateTest.php b/core/modules/user/tests/src/Kernel/UserTemplateTest.php --- b/core/modules/user/tests/src/Kernel/UserTemplateTest.php +++ b/core/modules/user/tests/src/Kernel/UserTemplateTest.php @@ -16,9 +16,11 @@ class UserTemplateTest extends KernelTestBase { /** - * {@inheritdoc} + * Modules to enable. + * + * @var array */ - public static $modules = ['user', 'user_access_test']; + protected static $modules = ['user', 'user_access_test']; /** * The renderer. @@ -37,7 +39,7 @@ /** * {@inheritdoc} */ - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->installEntitySchema('user'); $this->renderer = $this->container->get('renderer');