From af16e10d1e10d27d47b488f662088a5d33565965 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Tue, 26 Nov 2019 14:19:08 +0000
Subject: [PATCH] Issue #3093214 by amateescu: Remove workspaces.module BC
layers
---
.../workspaces/src/Entity/Workspace.php | 22 ------------------
.../workspaces/src/WorkspaceInterface.php | 23 -------------------
2 files changed, 45 deletions(-)
diff --git a/core/modules/workspaces/src/Entity/Workspace.php b/core/modules/workspaces/src/Entity/Workspace.php
index da1eecec7526..3236e3ccbcad 100644
--- a/core/modules/workspaces/src/Entity/Workspace.php
+++ b/core/modules/workspaces/src/Entity/Workspace.php
@@ -130,14 +130,6 @@ public function publish() {
return \Drupal::service('workspaces.operation_factory')->getPublisher($this)->publish();
}
- /**
- * {@inheritdoc}
- */
- public function isDefaultWorkspace() {
- @trigger_error('WorkspaceInterface::isDefaultWorkspace() is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use \Drupal\workspaces\WorkspaceManager::hasActiveWorkspace() instead. See https://www.drupal.org/node/3071527', E_USER_DEPRECATED);
- return FALSE;
- }
-
/**
* {@inheritdoc}
*/
@@ -193,18 +185,4 @@ public static function postDelete(EntityStorageInterface $storage, array $entiti
\Drupal::service('workspaces.manager')->purgeDeletedWorkspacesBatch();
}
- /**
- * Default value callback for 'uid' base field definition.
- *
- * @deprecated The ::getCurrentUserId method is deprecated in 8.6.x and will
- * be removed before 9.0.0.
- *
- * @return int[]
- * An array containing the ID of the current user.
- */
- public static function getCurrentUserId() {
- @trigger_error('The ::getCurrentUserId method is deprecated in 8.6.x and will be removed before 9.0.0.', E_USER_DEPRECATED);
- return [\Drupal::currentUser()->id()];
- }
-
}
diff --git a/core/modules/workspaces/src/WorkspaceInterface.php b/core/modules/workspaces/src/WorkspaceInterface.php
index 5e0d2d3ebdd6..f62a1776e4f4 100644
--- a/core/modules/workspaces/src/WorkspaceInterface.php
+++ b/core/modules/workspaces/src/WorkspaceInterface.php
@@ -11,34 +11,11 @@
*/
interface WorkspaceInterface extends ContentEntityInterface, EntityChangedInterface, EntityOwnerInterface {
- /**
- * The ID of the default workspace.
- *
- * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
- * \Drupal\workspaces\WorkspaceManager::hasActiveWorkspace() instead.
- *
- * @see https://www.drupal.org/node/3071527
- */
- const DEFAULT_WORKSPACE = 'live';
-
/**
* Publishes the contents of this workspace to the default (Live) workspace.
*/
public function publish();
- /**
- * Determines whether the workspace is the default one or not.
- *
- * @return bool
- * TRUE if this workspace is the default one (e.g 'Live'), FALSE otherwise.
- *
- * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
- * \Drupal\workspaces\WorkspaceManager::hasActiveWorkspace() instead.
- *
- * @see https://www.drupal.org/node/3071527
- */
- public function isDefaultWorkspace();
-
/**
* Gets the workspace creation timestamp.
*
--
GitLab