Issue #3442399 by catch: Remove deprecated code/bc layers from workspaces module

core/modules/workspaces/src/Form/WorkspaceFormInterface.php

-<?php
-
-namespace Drupal\workspaces\Form;
-
-use Drupal\Core\Form\FormInterface;
-
-/**
- * Defines interface for workspace forms so they can be easily distinguished.
- *
- * @internal
- *
- * @deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. Use
- *   \Drupal\Core\Form\WorkspaceSafeFormInterface or
- *   \Drupal\Core\Form\WorkspaceDynamicSafeFormInterface instead.
- *
- * @see https://www.drupal.org/node/3229111
- */
-interface WorkspaceFormInterface extends FormInterface {}

core/modules/workspaces/src/WorkspaceAssociation.php

@@ -22,27 +22,6 @@ class WorkspaceAssociation implements WorkspaceAssociationInterface, EventSubscr
    */
   const TABLE = 'workspace_association';
 
-  /**
-   * The database connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $database;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The workspace repository service.
-   *
-   * @var \Drupal\workspaces\WorkspaceRepositoryInterface
-   */
-  protected $workspaceRepository;
-
   /**
    * A multidimensional array of entity IDs that are associated to a workspace.
    *
@@ -63,26 +42,7 @@ class WorkspaceAssociation implements WorkspaceAssociationInterface, EventSubscr
    */
   protected array $associatedInitialRevisions = [];
 
-  /**
-   * Constructs a WorkspaceAssociation object.
-   *
-   * @param \Drupal\Core\Database\Connection $connection
-   *   A database connection for reading and writing path aliases.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager for querying revisions.
-   * @param \Drupal\workspaces\WorkspaceRepositoryInterface $workspace_repository
-   *   The Workspace repository service.
-   * @param \Psr\Log\LoggerInterface|null $logger
-   *   The logger.
-   */
-  public function __construct(Connection $connection, EntityTypeManagerInterface $entity_type_manager, WorkspaceRepositoryInterface $workspace_repository, protected ?LoggerInterface $logger = NULL) {
-    $this->database = $connection;
-    $this->entityTypeManager = $entity_type_manager;
-    $this->workspaceRepository = $workspace_repository;
-    if ($this->logger === NULL) {
-      @trigger_error('Calling ' . __METHOD__ . '() without the $logger argument is deprecated in drupal:10.1.0 and it will be required in drupal:11.0.0. See https://www.drupal.org/node/2932520', E_USER_DEPRECATED);
-      $this->logger = \Drupal::service('logger.channel.workspaces');
-    }
+  public function __construct(protected Connection $database, protected EntityTypeManagerInterface $entityTypeManager, protected WorkspaceRepositoryInterface $workspaceRepository, protected LoggerInterface $logger) {
   }
 
   /**
@@ -333,14 +293,6 @@ public function getEntityTrackingWorkspaceIds(RevisionableInterface $entity, boo
     return array_keys(array_intersect_key($tree, array_flip($result)));
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function postPublish(WorkspaceInterface $workspace) {
-    @trigger_error(__METHOD__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use the \Drupal\workspaces\Event\WorkspacePostPublishEvent event instead. See https://www.drupal.org/node/3242573', E_USER_DEPRECATED);
-    $this->deleteAssociations($workspace->id());
-  }
-
   /**
    * {@inheritdoc}
    */

core/modules/workspaces/src/WorkspaceAssociationInterface.php

@@ -106,19 +106,6 @@ public function getAssociatedInitialRevisions(string $workspace_id, string $enti
    */
   public function getEntityTrackingWorkspaceIds(RevisionableInterface $entity, bool $latest_revision = FALSE);
 
-  /**
-   * Triggers clean-up operations after publishing a workspace.
-   *
-   * @param \Drupal\workspaces\WorkspaceInterface $workspace
-   *   A workspace entity.
-   *
-   * @deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use the
-   *   \Drupal\workspaces\Event\WorkspacePostPublishEvent event instead.
-   *
-   * @see https://www.drupal.org/node/3242573
-   */
-  public function postPublish(WorkspaceInterface $workspace);
-
   /**
    * Deletes all the workspace association records for the given workspace.
    *

core/modules/workspaces/src/WorkspaceManager.php

@@ -4,7 +4,6 @@
 
 use Drupal\Core\Cache\MemoryCache\MemoryCacheInterface;
 use Drupal\Core\DependencyInjection\ClassResolverInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Session\AccountProxyInterface;
 use Drupal\Core\Site\Settings;
@@ -20,76 +19,6 @@ class WorkspaceManager implements WorkspaceManagerInterface {
 
   use StringTranslationTrait;
 
-  /**
-   * The request stack.
-   *
-   * @var \Symfony\Component\HttpFoundation\RequestStack
-   */
-  protected $requestStack;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The entity memory cache service.
-   *
-   * @var \Drupal\Core\Cache\MemoryCache\MemoryCacheInterface
-   */
-  protected $entityMemoryCache;
-
-  /**
-   * The current user.
-   *
-   * @var \Drupal\Core\Session\AccountProxyInterface
-   */
-  protected $currentUser;
-
-  /**
-   * The state service.
-   *
-   * @var \Drupal\Core\State\StateInterface
-   */
-  protected $state;
-
-  /**
-   * A logger instance.
-   *
-   * @var \Psr\Log\LoggerInterface
-   */
-  protected $logger;
-
-  /**
-   * The class resolver.
-   *
-   * @var \Drupal\Core\DependencyInjection\ClassResolverInterface
-   */
-  protected $classResolver;
-
-  /**
-   * The workspace association service.
-   *
-   * @var \Drupal\workspaces\WorkspaceAssociationInterface
-   */
-  protected $workspaceAssociation;
-
-  /**
-   * The workspace information service.
-   *
-   * @var \Drupal\workspaces\WorkspaceInformationInterface
-   */
-  protected WorkspaceInformationInterface $workspaceInfo;
-
-  /**
-   * The workspace negotiator service IDs.
-   *
-   * @var array
-   */
-  protected $negotiatorIds;
-
   /**
    * The current active workspace or FALSE if there is no active workspace.
    *
@@ -97,67 +26,7 @@ class WorkspaceManager implements WorkspaceManagerInterface {
    */
   protected $activeWorkspace;
 
-  /**
-   * Constructs a new WorkspaceManager.
-   *
-   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
-   *   The request stack.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Cache\MemoryCache\MemoryCacheInterface $entity_memory_cache
-   *   The entity memory cache service.
-   * @param \Drupal\Core\Session\AccountProxyInterface $current_user
-   *   The current user.
-   * @param \Drupal\Core\State\StateInterface $state
-   *   The state service.
-   * @param \Psr\Log\LoggerInterface $logger
-   *   A logger instance.
-   * @param \Drupal\Core\DependencyInjection\ClassResolverInterface $class_resolver
-   *   The class resolver.
-   * @param \Drupal\workspaces\WorkspaceAssociationInterface $workspace_association
-   *   The workspace association service.
-   * @param \Drupal\workspaces\WorkspaceInformationInterface|null $workspace_information
-   *   The workspace information service.
-   * @param array|null $negotiator_ids
-   *   The workspace negotiator service IDs.
-   */
-  public function __construct(RequestStack $request_stack, EntityTypeManagerInterface $entity_type_manager, MemoryCacheInterface $entity_memory_cache, AccountProxyInterface $current_user, StateInterface $state, LoggerInterface $logger, ClassResolverInterface $class_resolver, WorkspaceAssociationInterface $workspace_association, protected ?WorkspaceInformationInterface $workspace_information = NULL, array $negotiator_ids = NULL) {
-    $this->requestStack = $request_stack;
-    $this->entityTypeManager = $entity_type_manager;
-    $this->entityMemoryCache = $entity_memory_cache;
-    $this->currentUser = $current_user;
-    $this->state = $state;
-    $this->logger = $logger;
-    $this->classResolver = $class_resolver;
-    $this->workspaceAssociation = $workspace_association;
-
-    if (!$workspace_information instanceof WorkspaceInformationInterface) {
-      @trigger_error('Calling ' . __METHOD__ . '() without the $workspace_information argument is deprecated in drupal:10.3.0 and will be required in drupal:11.0.0. See https://www.drupal.org/node/3324297', E_USER_DEPRECATED);
-      $this->workspaceInfo = \Drupal::service('workspaces.information');
-
-      // The negotiator IDs are always the last constructor argument.
-      $this->negotiatorIds = $workspace_information;
-    }
-    else {
-      $this->workspaceInfo = $workspace_information;
-      $this->negotiatorIds = $negotiator_ids;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isEntityTypeSupported(EntityTypeInterface $entity_type) {
-    @trigger_error(__METHOD__ . '() is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. Use \Drupal\workspaces\WorkspaceInformation::isEntityTypeSupported instead. See https://www.drupal.org/node/3324297', E_USER_DEPRECATED);
-    return $this->workspaceInfo->isEntityTypeSupported($entity_type);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getSupportedEntityTypes() {
-    @trigger_error(__METHOD__ . '() is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. Use \Drupal\workspaces\WorkspaceInformation::getSupportedEntityTypes instead. See https://www.drupal.org/node/3324297', E_USER_DEPRECATED);
-    return $this->workspaceInfo->getSupportedEntityTypes();
+  public function __construct(protected RequestStack $requestStack, protected EntityTypeManagerInterface $entityTypeManager, protected MemoryCacheInterface $entityMemoryCache, protected AccountProxyInterface $currentUser, protected StateInterface $state, protected LoggerInterface $logger, protected ClassResolverInterface $classResolver, protected WorkspaceAssociationInterface $workspaceAssociation, protected WorkspaceInformationInterface $workspaceInfo, protected array $negotiatorIds = []) {
   }
 
   /**
@@ -295,14 +164,6 @@ public function executeOutsideWorkspace(callable $function) {
     return $result;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function shouldAlterOperations(EntityTypeInterface $entity_type) {
-    @trigger_error(__METHOD__ . '() is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3324297', E_USER_DEPRECATED);
-    return $this->workspaceInfo->isEntityTypeSupported($entity_type) && $this->hasActiveWorkspace();
-  }
-
   /**
    * {@inheritdoc}
    */

core/modules/workspaces/src/WorkspaceManagerInterface.php

@@ -2,42 +2,11 @@
 
 namespace Drupal\workspaces;
 
-use Drupal\Core\Entity\EntityTypeInterface;
-
 /**
  * Provides an interface for managing Workspaces.
  */
 interface WorkspaceManagerInterface {
 
-  /**
-   * Returns whether an entity type can belong to a workspace or not.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type to check.
-   *
-   * @return bool
-   *   TRUE if the entity type can belong to a workspace, FALSE otherwise.
-   *
-   * @deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. Use
-   *   \Drupal\workspaces\WorkspaceInformation::isEntityTypeSupported instead.
-   *
-   * @see https://www.drupal.org/node/3324297
-   */
-  public function isEntityTypeSupported(EntityTypeInterface $entity_type);
-
-  /**
-   * Returns an array of entity types that can belong to workspaces.
-   *
-   * @return \Drupal\Core\Entity\EntityTypeInterface[]
-   *   The entity types what can belong to workspaces.
-   *
-   * @deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. Use
-   *   \Drupal\workspaces\WorkspaceInformation::getSupportedEntityTypes instead.
-   *
-   * @see https://www.drupal.org/node/3324297
-   */
-  public function getSupportedEntityTypes();
-
   /**
    * Determines whether a workspace is active in the current request.
    *
@@ -98,23 +67,6 @@ public function executeInWorkspace($workspace_id, callable $function);
    */
   public function executeOutsideWorkspace(callable $function);
 
-  /**
-   * Determines whether runtime entity operations should be altered.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type to check.
-   *
-   * @return bool
-   *   TRUE if the entity operations or queries should be altered in the current
-   *   request, FALSE otherwise.
-   *
-   * @deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no
-   *   replacement.
-   *
-   * @see https://www.drupal.org/node/3324297
-   */
-  public function shouldAlterOperations(EntityTypeInterface $entity_type);
-
   /**
    * Deletes the revisions associated with deleted workspaces.
    */

core/modules/workspaces/src/WorkspaceMerger.php

@@ -14,67 +14,7 @@
  */
 class WorkspaceMerger implements WorkspaceMergerInterface {
 
-  /**
-   * The source workspace entity.
-   *
-   * @var \Drupal\workspaces\WorkspaceInterface
-   */
-  protected $sourceWorkspace;
-
-  /**
-   * The target workspace entity.
-   *
-   * @var \Drupal\workspaces\WorkspaceInterface
-   */
-  protected $targetWorkspace;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The database connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $database;
-
-  /**
-   * The workspace association service.
-   *
-   * @var \Drupal\workspaces\WorkspaceAssociationInterface
-   */
-  protected $workspaceAssociation;
-
-  /**
-   * Constructs a new WorkspaceMerger.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Database\Connection $database
-   *   Database connection.
-   * @param \Drupal\workspaces\WorkspaceAssociationInterface $workspace_association
-   *   The workspace association service.
-   * @param \Drupal\workspaces\WorkspaceInterface $source
-   *   The source workspace.
-   * @param \Drupal\workspaces\WorkspaceInterface $target
-   *   The target workspace.
-   * @param \Psr\Log\LoggerInterface|null $logger
-   *   The logger.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, Connection $database, WorkspaceAssociationInterface $workspace_association, WorkspaceInterface $source, WorkspaceInterface $target, protected ?LoggerInterface $logger = NULL) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->database = $database;
-    $this->workspaceAssociation = $workspace_association;
-    $this->sourceWorkspace = $source;
-    $this->targetWorkspace = $target;
-    if ($this->logger === NULL) {
-      @trigger_error('Calling ' . __METHOD__ . '() without the $logger argument is deprecated in drupal:10.1.0 and it will be required in drupal:11.0.0. See https://www.drupal.org/node/2932520', E_USER_DEPRECATED);
-      $this->logger = \Drupal::service('logger.channel.workspaces');
-    }
+  public function __construct(protected EntityTypeManagerInterface $entityTypeManager, protected Connection $database, protected WorkspaceAssociationInterface $workspaceAssociation, protected WorkspaceInterface $sourceWorkspace, protected WorkspaceInterface $targetWorkspace, protected LoggerInterface $logger) {
   }
 
   /**

core/modules/workspaces/src/WorkspaceOperationFactory.php

@@ -2,9 +2,7 @@
 
 namespace Drupal\workspaces;
 
-use Drupal\Core\Cache\CacheTagsInvalidatorInterface;
 use Drupal\Core\Database\Connection;
-use Drupal\Core\DependencyInjection\DeprecatedServicePropertyTrait;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
@@ -19,97 +17,7 @@
  */
 class WorkspaceOperationFactory {
 
-  use DeprecatedServicePropertyTrait;
-
-  /**
-   * Defines deprecated injected properties.
-   *
-   * @var array
-   */
-  protected array $deprecatedProperties = [
-    'cacheTagInvalidator' => 'cache_tags.invalidator',
-  ];
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The database connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $database;
-
-  /**
-   * The workspace manager.
-   *
-   * @var \Drupal\workspaces\WorkspaceManagerInterface
-   */
-  protected $workspaceManager;
-
-  /**
-   * The workspace association service.
-   *
-   * @var \Drupal\workspaces\WorkspaceAssociationInterface
-   */
-  protected $workspaceAssociation;
-
-  /**
-   * An event dispatcher instance to use for configuration events.
-   *
-   * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface
-   */
-  protected $eventDispatcher;
-
-  /**
-   * The logger service.
-   *
-   * @var \Psr\Log\LoggerInterface
-   */
-  protected $logger;
-
-  /**
-   * Constructs a new WorkspaceOperationFactory.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Database\Connection $database
-   *   Database connection.
-   * @param \Drupal\workspaces\WorkspaceManagerInterface $workspace_manager
-   *   The workspace manager service.
-   * @param \Drupal\workspaces\WorkspaceAssociationInterface $workspace_association
-   *   The workspace association service.
-   * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface|\Drupal\Core\Cache\CacheTagsInvalidatorInterface $event_dispatcher
-   *   The event dispatcher.
-   * @param \Psr\Log\LoggerInterface|null $logger
-   *   The logger.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, Connection $database, WorkspaceManagerInterface $workspace_manager, WorkspaceAssociationInterface $workspace_association, EventDispatcherInterface|CacheTagsInvalidatorInterface $event_dispatcher, LoggerInterface|EventDispatcherInterface $logger = NULL) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->database = $database;
-    $this->workspaceManager = $workspace_manager;
-    $this->workspaceAssociation = $workspace_association;
-
-    if ($event_dispatcher instanceof CacheTagsInvalidatorInterface) {
-      $event_dispatcher = \Drupal::service('event_dispatcher');
-      @trigger_error('Calling ' . __METHOD__ . '() with the $cache_tags_invalidator argument is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. See https://www.drupal.org/node/3440755', E_USER_DEPRECATED);
-    }
-    elseif (!$event_dispatcher instanceof EventDispatcherInterface) {
-      $event_dispatcher = \Drupal::service('event_dispatcher');
-      @trigger_error('Calling ' . __METHOD__ . '() without the $event_dispatcher argument is deprecated in drupal:10.1.0 and it will be required in drupal:11.0.0. See https://www.drupal.org/node/3242573', E_USER_DEPRECATED);
-    }
-    $this->eventDispatcher = $event_dispatcher;
-
-    $logger = func_get_arg(5);
-    if (!$logger instanceof LoggerInterface) {
-      $logger = \Drupal::service('logger.channel.workspaces');
-      @trigger_error('Calling ' . __METHOD__ . '() without the $logger argument is deprecated in drupal:10.1.0 and it will be required in drupal:11.0.0. See https://www.drupal.org/node/2932520', E_USER_DEPRECATED);
-    }
-    $this->logger = $logger;
+  public function __construct(protected EntityTypeManagerInterface $entityTypeManager, protected Connection $database, protected WorkspaceManagerInterface $workspaceManager, protected WorkspaceAssociationInterface $workspaceAssociation, protected EventDispatcherInterface $eventDispatcher, protected LoggerInterface $logger) {
   }
 
   /**

core/modules/workspaces/src/WorkspacePublisher.php

@@ -9,6 +9,7 @@
 use Drupal\workspaces\Event\WorkspacePostPublishEvent;
 use Drupal\workspaces\Event\WorkspacePrePublishEvent;
 use Psr\Log\LoggerInterface;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**
  * Default implementation of the workspace publisher.
@@ -19,82 +20,7 @@ class WorkspacePublisher implements WorkspacePublisherInterface {
 
   use StringTranslationTrait;
 
-  /**
-   * The source workspace entity.
-   *
-   * @var \Drupal\workspaces\WorkspaceInterface
-   */
-  protected $sourceWorkspace;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The database connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $database;
-
-  /**
-   * The workspace manager.
-   *
-   * @var \Drupal\workspaces\WorkspaceManagerInterface
-   */
-  protected $workspaceManager;
-
-  /**
-   * The workspace association service.
-   *
-   * @var \Drupal\workspaces\WorkspaceAssociationInterface
-   */
-  protected $workspaceAssociation;
-
-  /**
-   * The event dispatcher.
-   *
-   * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface
-   */
-  protected $eventDispatcher;
-
-  /**
-   * Constructs a new WorkspacePublisher.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Database\Connection $database
-   *   Database connection.
-   * @param \Drupal\workspaces\WorkspaceManagerInterface $workspace_manager
-   *   The workspace manager.
-   * @param \Drupal\workspaces\WorkspaceAssociationInterface $workspace_association
-   *   The workspace association service.
-   * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher
-   *   The event dispatcher.
-   * @param \Drupal\workspaces\WorkspaceInterface $source
-   *   The source workspace entity.
-   * @param \Psr\Log\LoggerInterface|null $logger
-   *   The logger.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, Connection $database, WorkspaceManagerInterface $workspace_manager, WorkspaceAssociationInterface $workspace_association, $event_dispatcher, WorkspaceInterface $source = NULL, protected ?LoggerInterface $logger = NULL) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->database = $database;
-    $this->workspaceManager = $workspace_manager;
-    $this->workspaceAssociation = $workspace_association;
-    if ($event_dispatcher instanceof WorkspaceInterface) {
-      @trigger_error('Calling WorkspacePublisher::__construct() without the $event_dispatcher argument is deprecated in drupal:10.1.0 and will be required in drupal:11.0.0. See https://www.drupal.org/node/3242573', E_USER_DEPRECATED);
-      $source = $event_dispatcher;
-      $event_dispatcher = \Drupal::service('event_dispatcher');
-    }
-    $this->eventDispatcher = $event_dispatcher;
-    $this->sourceWorkspace = $source;
-    if ($this->logger === NULL) {
-      @trigger_error('Calling ' . __METHOD__ . '() without the $logger argument is deprecated in drupal:10.1.0 and it will be required in drupal:11.0.0. See https://www.drupal.org/node/2932520', E_USER_DEPRECATED);
-      $this->logger = \Drupal::service('logger.channel.workspaces');
-    }
+  public function __construct(protected EntityTypeManagerInterface $entityTypeManager, protected Connection $database, protected WorkspaceManagerInterface $workspaceManager, protected WorkspaceAssociationInterface $workspaceAssociation, protected EventDispatcherInterface $eventDispatcher, protected WorkspaceInterface $sourceWorkspace, protected LoggerInterface $logger) {
   }
 
   /**

core/modules/workspaces/tests/src/Kernel/WorkspaceAssociationDeprecationTest.php

-<?php
-
-declare(strict_types=1);
-
-namespace Drupal\Tests\workspaces\Kernel;
-
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\workspaces\Entity\Workspace;
-
-/**
- * @coversDefaultClass \Drupal\workspaces\WorkspaceAssociation
- * @group legacy
- */
-class WorkspaceAssociationDeprecationTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $modules = ['user', 'workspaces'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp(): void {
-    parent::setUp();
-
-    $this->installEntitySchema('workspace');
-    $this->installSchema('workspaces', ['workspace_association']);
-  }
-
-  /**
-   * @covers ::postPublish
-   */
-  public function testPostPublishDeprecation(): void {
-    $this->expectDeprecation('Drupal\workspaces\WorkspaceAssociation::postPublish() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use the \Drupal\workspaces\Event\WorkspacePostPublishEvent event instead. See https://www.drupal.org/node/3242573');
-
-    $workspace = Workspace::create([
-      'id' => 'test',
-      'label' => 'Test',
-    ]);
-    $workspace->save();
-    \Drupal::service('workspaces.association')->postPublish($workspace);
-  }
-
-}