Issue #3128536 by amateescu, Charlie ChX Negyesi, phenaproxima: Simplify and...

Issue #3128536 by amateescu, Charlie ChX Negyesi, phenaproxima: Simplify and speed up WorkspaceManager::isEntityTypeSupported()

core/modules/workspaces/src/WorkspaceManager.php

@@ -22,16 +22,12 @@ class WorkspaceManager implements WorkspaceManagerInterface {
   use StringTranslationTrait;
 
   /**
-   * An array of entity type IDs that can not belong to a workspace.
-   *
-   * By default, only entity types which are revisionable and publishable can
-   * belong to a workspace.
+   * An array of which entity types are supported.
    *
    * @var string[]
    */
-  protected $blacklist = [
-    'workspace_association' => 'workspace_association',
-    'workspace' => 'workspace',
+  protected $supported = [
+    'workspace' => FALSE,
   ];
 
   /**
@@ -142,19 +138,13 @@ public function __construct(RequestStack $request_stack, EntityTypeManagerInterf
    * {@inheritdoc}
    */
   public function isEntityTypeSupported(EntityTypeInterface $entity_type) {
-    // First, check if we already determined whether this entity type is
-    // supported or not.
-    if (isset($this->blacklist[$entity_type->id()])) {
-      return FALSE;
-    }
-
-    if ($entity_type->entityClassImplements(EntityPublishedInterface::class) && $entity_type->isRevisionable()) {
-      return TRUE;
+    $entity_type_id = $entity_type->id();
+    if (!isset($this->supported[$entity_type_id])) {
+      // Only entity types which are revisionable and publishable can belong
+      // to a workspace.
+      $this->supported[$entity_type_id] = $entity_type->entityClassImplements(EntityPublishedInterface::class) && $entity_type->isRevisionable();
     }
-
-    // This entity type can not belong to a workspace, add it to the blacklist.
-    $this->blacklist[$entity_type->id()] = $entity_type->id();
-    return FALSE;
+    return $this->supported[$entity_type_id];
   }
 
   /**