diff --git a/core/modules/workspace/src/Controller/DeploymentController.php b/core/modules/workspace/src/Controller/DeploymentController.php index 67d5cdaf29..bbc8904723 100644 --- a/core/modules/workspace/src/Controller/DeploymentController.php +++ b/core/modules/workspace/src/Controller/DeploymentController.php @@ -36,7 +36,7 @@ class DeploymentController extends ControllerBase implements ContainerInjectionI * * @param \Drupal\workspace\WorkspaceManagerInterface $workspace_manager * @param \Drupal\Core\Form\FormBuilderInterface $form_builder - * @param \Drupal\workspace\UpstreamManager + * @param \Drupal\workspace\UpstreamManager $upstream_manager */ public function __construct(WorkspaceManagerInterface $workspace_manager, FormBuilderInterface $form_builder, UpstreamManager $upstream_manager) { $this->workspaceManager = $workspace_manager; diff --git a/core/modules/workspace/src/EntityAccess.php b/core/modules/workspace/src/EntityAccess.php index 4482894826..134e3adac5 100644 --- a/core/modules/workspace/src/EntityAccess.php +++ b/core/modules/workspace/src/EntityAccess.php @@ -97,9 +97,10 @@ public function entityAccess(EntityInterface $entity, $operation, AccountInterfa if (empty($result)) { return AccessResult::forbidden(); } + return $this->bypassAccessResult($account); } - return $this->bypassAccessResult($account); + return AccessResult::neutral(); } /** diff --git a/core/modules/workspace/src/KeyValueStore/DatabaseStorageSortedSet.php b/core/modules/workspace/src/KeyValueStore/DatabaseStorageSortedSet.php index 0c6d875dfe..ae0a62c3be 100644 --- a/core/modules/workspace/src/KeyValueStore/DatabaseStorageSortedSet.php +++ b/core/modules/workspace/src/KeyValueStore/DatabaseStorageSortedSet.php @@ -113,7 +113,7 @@ public function getCount() { ':collection' => $this->collection ])->fetchField(); } - catch(\Exception $e) { + catch (\Exception $e) { $this->catchException($e); } } diff --git a/core/modules/workspace/tests/src/Functional/WorkspacePermissionsTest.php b/core/modules/workspace/tests/src/Functional/WorkspacePermissionsTest.php index f70a8872ad..0438d8b8d6 100644 --- a/core/modules/workspace/tests/src/Functional/WorkspacePermissionsTest.php +++ b/core/modules/workspace/tests/src/Functional/WorkspacePermissionsTest.php @@ -164,4 +164,5 @@ public function testEditAnyWorkspace() { $this->drupalGet("/admin/structure/workspace/{$bears->id()}/edit"); $this->assertEquals(200, $session->getStatusCode()); } + } diff --git a/core/modules/workspace/workspace.module b/core/modules/workspace/workspace.module index 3dc160ce87..e95d4ba501 100644 --- a/core/modules/workspace/workspace.module +++ b/core/modules/workspace/workspace.module @@ -1,5 +1,10 @@