diff --git a/core/modules/comment/src/Entity/CommentType.php b/core/modules/comment/src/Entity/CommentType.php
index 77aa049538b6fd0cc1dec92e174a70951abd5d59..5cee3668898d2c2e60fc50954dba43d5fd87af7e 100644
--- a/core/modules/comment/src/Entity/CommentType.php
+++ b/core/modules/comment/src/Entity/CommentType.php
@@ -25,7 +25,7 @@
* "delete" = "Drupal\comment\Form\CommentTypeDeleteForm"
* },
* "route_provider" = {
- * "permissions" = "Drupal\user\Entity\EntityPermissionsRouteProviderWithCheck",
+ * "permissions" = "Drupal\user\Entity\EntityPermissionsRouteProvider",
* },
* "list_builder" = "Drupal\comment\CommentTypeListBuilder"
* },
diff --git a/core/modules/contact/src/Entity/ContactForm.php b/core/modules/contact/src/Entity/ContactForm.php
index 16c6d1cc7d9e9a3640669d6e4f5b151ec43c6043..641243b66d4fcb60c4d9a7f936ba6ee24a045c60 100644
--- a/core/modules/contact/src/Entity/ContactForm.php
+++ b/core/modules/contact/src/Entity/ContactForm.php
@@ -30,7 +30,7 @@
* "delete" = "Drupal\Core\Entity\EntityDeleteForm"
* },
* "route_provider" = {
- * "permissions" = "Drupal\user\Entity\EntityPermissionsRouteProviderWithCheck",
+ * "permissions" = "Drupal\user\Entity\EntityPermissionsRouteProvider",
* }
* },
* config_prefix = "form",
diff --git a/core/modules/user/src/Entity/EntityPermissionsRouteProvider.php b/core/modules/user/src/Entity/EntityPermissionsRouteProvider.php
index 09ce89159bc0d0d377da62091c6c3d775b717587..7e15cdbf5c66b6e730c613c9bdcf83cc03e5c283 100644
--- a/core/modules/user/src/Entity/EntityPermissionsRouteProvider.php
+++ b/core/modules/user/src/Entity/EntityPermissionsRouteProvider.php
@@ -13,13 +13,8 @@
/**
* Provides routes for the entity permissions form.
*
- * Use this class or EntityPermissionsRouteProviderWithCheck as a route
- * provider for an entity type such as Vocabulary. Either one will provide
- * routes for the entity permissions form. The
- * EntityPermissionsRouteProviderWithCheck class provides a custom access check:
- * it denies access if there are no entity-specific permissions. If you know
- * that each entity has permissions, or if the check is too expensive, then use
- * this class.
+ * Use this class as a route provider for an entity type such as Vocabulary. It
+ * will provide routes for the entity permissions form.
*/
class EntityPermissionsRouteProvider implements EntityRouteProviderInterface, EntityHandlerInterface {
diff --git a/core/modules/user/src/Entity/EntityPermissionsRouteProviderWithCheck.php b/core/modules/user/src/Entity/EntityPermissionsRouteProviderWithCheck.php
index be949001f734e3fba154228db385cd75f84d4c85..bd3e93ce8e79525d7d12201cfd970e8830f73112 100644
--- a/core/modules/user/src/Entity/EntityPermissionsRouteProviderWithCheck.php
+++ b/core/modules/user/src/Entity/EntityPermissionsRouteProviderWithCheck.php
@@ -14,6 +14,10 @@
* access if there are no entity-specific permissions. If you know that each
* entity has permissions, or if the check is too expensive, then use
* EntityPermissionsRouteProvider instead of this class.
+ *
+ * @deprecated in drupal:11.1.0 and is removed from drupal:12.0.0. Use
+ * EntityPermissionsRouteProvider instead.
+ * @see https://www.drupal.org/node/3384745
*/
class EntityPermissionsRouteProviderWithCheck extends EntityPermissionsRouteProvider {
@@ -21,6 +25,7 @@ class EntityPermissionsRouteProviderWithCheck extends EntityPermissionsRouteProv
* {@inheritdoc}
*/
protected function getEntityPermissionsRoute(EntityTypeInterface $entity_type): ?Route {
+ @trigger_error(__CLASS__ . ' is deprecated in drupal:11.1.0 and is removed from drupal:12.0.0. Use EntityPermissionsRouteProvider instead. See https://www.drupal.org/node/3384745', E_USER_DEPRECATED);
$route = parent::getEntityPermissionsRoute($entity_type);
if ($route) {
$route->setRequirement('_custom_access', '\Drupal\user\Form\EntityPermissionsForm::access');
diff --git a/core/modules/user/src/Form/EntityPermissionsForm.php b/core/modules/user/src/Form/EntityPermissionsForm.php
index d97b5987b67c0837af45c24170374cdbf4c4219e..47ca4e07de7751e582ab81ad6ebe0495b606c46c 100644
--- a/core/modules/user/src/Form/EntityPermissionsForm.php
+++ b/core/modules/user/src/Form/EntityPermissionsForm.php
@@ -158,8 +158,13 @@ public function buildForm(array $form, FormStateInterface $form_state, ?string $
*
* @return \Drupal\Core\Access\AccessResultInterface
* The access result.
+ *
+ * @deprecated in drupal:11.1.0 and is removed from drupal:12.0.0. Use
+ * a permissions check in the route definition instead.
+ * @see https://www.drupal.org/node/3384745
*/
public function access(Route $route, RouteMatchInterface $route_match, $bundle = NULL): AccessResultInterface {
+ @trigger_error(__METHOD__ . '() is deprecated in drupal:11.1.0 and is removed from drupal:12.0.0. Use a permissions check on the route definition instead. See https://www.drupal.org/node/3384745', E_USER_DEPRECATED);
$permission = $route->getRequirement('_permission');
if ($permission && !$this->currentUser()->hasPermission($permission)) {
return AccessResult::neutral()->cachePerPermissions();
diff --git a/core/modules/user/src/Form/UserPermissionsForm.php b/core/modules/user/src/Form/UserPermissionsForm.php
index 8874b2661417851281d9d54d41e47c7d724f7e22..0428925fa03228888d87c77c1b70a31bda8f1384 100644
--- a/core/modules/user/src/Form/UserPermissionsForm.php
+++ b/core/modules/user/src/Form/UserPermissionsForm.php
@@ -173,6 +173,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$form['permissions'] = [
'#type' => 'table',
+ '#empty' => $this->t('No permissions found.'),
'#header' => [$this->t('Permission')],
'#id' => 'permissions',
'#attributes' => ['class' => ['permissions', 'js-permissions']],
diff --git a/core/modules/user/tests/src/Functional/UserPermissionsTest.php b/core/modules/user/tests/src/Functional/UserPermissionsTest.php
index e0112f1d6765f7143bfc6e10f385293591640581..b9faf636318647628aeb41af1f24f8e31d926d97 100644
--- a/core/modules/user/tests/src/Functional/UserPermissionsTest.php
+++ b/core/modules/user/tests/src/Functional/UserPermissionsTest.php
@@ -272,7 +272,8 @@ public function testAccessBundlePermission(): void {
$this->submitForm($edit, 'Save');
$this->assertSession()->pageTextContains('Contact form ' . $edit['label'] . ' has been added.');
$this->drupalGet('admin/structure/contact/manage/test_contact_type/permissions');
- $this->assertSession()->statusCodeEquals(403);
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertSession()->pageTextContains('No permissions found.');
// Permissions can be changed using the bundle-specific pages.
$edit = [];
@@ -322,12 +323,13 @@ public function testBundlePermissionError(): void {
$this->drupalGet('/admin/structure/comment/manage/comment/display');
$assert_session->statusCodeEquals(200);
$this->drupalGet('/admin/structure/comment/manage/comment/permissions');
- $assert_session->statusCodeEquals(403);
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertSession()->pageTextContains('No permissions found.');
// Ensure there are no warnings in the log.
$this->drupalGet('/admin/reports/dblog');
$assert_session->statusCodeEquals(200);
- $assert_session->pageTextContains('access denied');
+ $assert_session->pageTextContains('Session opened');
$assert_session->pageTextNotContains("Entity view display 'node.article.default': Component");
}
diff --git a/core/modules/user/tests/src/Unit/Entity/EntityPermissionsRouteProviderWithCheckTest.php b/core/modules/user/tests/src/Unit/Entity/EntityPermissionsRouteProviderWithCheckTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..627a0ea6e408c505c3c34b1fbc0a2dd5f69e4052
--- /dev/null
+++ b/core/modules/user/tests/src/Unit/Entity/EntityPermissionsRouteProviderWithCheckTest.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\Tests\user\Unit\Entity;
+
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Tests\UnitTestCase;
+use Drupal\user\Entity\EntityPermissionsRouteProviderWithCheck;
+
+/**
+ * Tests the route provider deprecation.
+ *
+ * @coversDefaultClass \Drupal\user\Entity\EntityPermissionsRouteProviderWithCheck
+ * @group user
+ * @group legacy
+ */
+class EntityPermissionsRouteProviderWithCheckTest extends UnitTestCase {
+
+ /**
+ * Tests the route provider deprecation.
+ *
+ * @covers ::getEntityPermissionsRoute
+ *
+ * @group legacy
+ */
+ public function testEntityPermissionsRouteProviderWithCheck(): void {
+
+ // Mock the constructor parameters.
+ $prophecy = $this->prophesize(EntityTypeInterface::class);
+ $entity_type = $prophecy->reveal();
+ $prophecy = $this->prophesize(EntityTypeManagerInterface::class);
+ $prophecy->getDefinition('entity_type')
+ ->willReturn($entity_type);
+ $entity_type_manager = $prophecy->reveal();
+
+ $this->expectDeprecation('Drupal\user\Entity\EntityPermissionsRouteProviderWithCheck is deprecated in drupal:11.1.0 and is removed from drupal:12.0.0. Use EntityPermissionsRouteProvider instead. See https://www.drupal.org/node/3384745');
+ (new EntityPermissionsRouteProviderWithCheck($entity_type_manager))
+ ->getRoutes($entity_type);
+ }
+
+}
diff --git a/core/modules/user/tests/src/Unit/Form/EntityPermissionsFormTest.php b/core/modules/user/tests/src/Unit/Form/EntityPermissionsFormTest.php
index c240aafa803e8ad0747055ffd6b2395eb09c023d..aba42464d88ac90a5df7c91e2ebd4b8047190044 100644
--- a/core/modules/user/tests/src/Unit/Form/EntityPermissionsFormTest.php
+++ b/core/modules/user/tests/src/Unit/Form/EntityPermissionsFormTest.php
@@ -24,6 +24,7 @@
*
* @coversDefaultClass \Drupal\user\Form\EntityPermissionsForm
* @group user
+ * @group legacy
*/
class EntityPermissionsFormTest extends UnitTestCase {
@@ -93,6 +94,7 @@ public function testPermissionsByProvider(string $dependency_name, bool $found):
$access_actual = $bundle_form->access($route, $route_match, $bundle);
$this->assertEquals($found ? AccessResult::allowed() : AccessResult::neutral(), $access_actual);
+ $this->expectDeprecation('Drupal\user\Form\EntityPermissionsForm::access() is deprecated in drupal:11.1.0 and is removed from drupal:12.0.0. Use a permissions check on the route definition instead. See https://www.drupal.org/node/3384745');
}
/**