diff --git a/core/modules/workspaces/src/Entity/Workspace.php b/core/modules/workspaces/src/Entity/Workspace.php index da1eecec75269924a57259b4eee785702907eedc..3236e3ccbcad0f0fe0eaa0e8814688a27d908c41 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 5e0d2d3ebdd6a14871d5b1869f3c949f7df9d862..f62a1776e4f462f2d8b78e5cb59358f97de2cf1c 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. *