From 20ee128084d5f0be8fcf6cd88438be39016a9001 Mon Sep 17 00:00:00 2001 From: catch Date: Wed, 1 Jul 2020 10:31:00 +0100 Subject: [PATCH] Issue #3152848 by alexpott: Clean up bc_entity_resource_permissions code - it does not exist anymore --- .../Functional/Rest/ConfigTestResourceTestBase.php | 4 ---- .../src/Functional/Rest/FileResourceTestBase.php | 12 ------------ .../Functional/Rest/ShortcutSetResourceTestBase.php | 4 ---- .../Rest/EntityTestMapFieldResourceTestBase.php | 4 ---- 4 files changed, 24 deletions(-) diff --git a/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestResourceTestBase.php b/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestResourceTestBase.php index b3e425eda9..50a40c6af9 100644 --- a/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestResourceTestBase.php +++ b/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestResourceTestBase.php @@ -74,10 +74,6 @@ protected function getNormalizedPostEntity() { * {@inheritdoc} */ protected function getExpectedUnauthorizedAccessMessage($method) { - if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) { - return parent::getExpectedUnauthorizedAccessMessage($method); - } - switch ($method) { case 'GET': return "The 'view config_test' permission is required."; diff --git a/core/modules/file/tests/src/Functional/Rest/FileResourceTestBase.php b/core/modules/file/tests/src/Functional/Rest/FileResourceTestBase.php index ebbf6ac537..785c82c77c 100644 --- a/core/modules/file/tests/src/Functional/Rest/FileResourceTestBase.php +++ b/core/modules/file/tests/src/Functional/Rest/FileResourceTestBase.php @@ -59,18 +59,6 @@ protected function setUpAuthorization($method) { } } - /** - * {@inheritdoc} - */ - protected function grantPermissionsToTestedRole(array $permissions) { - // testPatch() and testDelete() test the 'bc_entity_resource_permissions' BC - // layer; also call makeCurrentUserFileOwner() then. - if ($permissions === ['restful patch entity:file'] || $permissions === ['restful delete entity:file']) { - $this->makeCurrentUserFileOwner(); - } - parent::grantPermissionsToTestedRole($permissions); - } - /** * Makes the current user the file owner. */ diff --git a/core/modules/shortcut/tests/src/Functional/Rest/ShortcutSetResourceTestBase.php b/core/modules/shortcut/tests/src/Functional/Rest/ShortcutSetResourceTestBase.php index a1ec71b302..4c4483c11b 100644 --- a/core/modules/shortcut/tests/src/Functional/Rest/ShortcutSetResourceTestBase.php +++ b/core/modules/shortcut/tests/src/Functional/Rest/ShortcutSetResourceTestBase.php @@ -89,10 +89,6 @@ protected function getNormalizedPostEntity() { * {@inheritdoc} */ protected function getExpectedUnauthorizedAccessMessage($method) { - if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) { - return parent::getExpectedUnauthorizedAccessMessage($method); - } - switch ($method) { case 'GET': return "The 'access shortcuts' permission is required."; diff --git a/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestMapFieldResourceTestBase.php b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestMapFieldResourceTestBase.php index 7616fb7fb3..9a836b97e5 100644 --- a/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestMapFieldResourceTestBase.php +++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestMapFieldResourceTestBase.php @@ -136,10 +136,6 @@ protected function getNormalizedPostEntity() { * {@inheritdoc} */ protected function getExpectedUnauthorizedAccessMessage($method) { - if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) { - return parent::getExpectedUnauthorizedAccessMessage($method); - } - return "The 'administer entity_test content' permission is required."; } -- GitLab