Merge pull request #5083 from dlubitz/90/bugfix/node-cache-entry-iden…

…tifier-workspace-aware BUGFIX Workspace aware NodeCacheEntryIdentifier
neos · Jun 14, 2024 · 8cdcc5f · 8cdcc5f
2 parents baf35c3 + 0db90e3
commit 8cdcc5f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...Domain/Model/NodeCacheEntryIdentifier.php → ...Fusion/Cache/NodeCacheEntryIdentifier.php b/...Domain/Model/NodeCacheEntryIdentifier.php → ...Fusion/Cache/NodeCacheEntryIdentifier.php
@@ -12,7 +12,7 @@
 
 declare(strict_types=1);
 
-namespace Neos\Neos\Domain\Model;
+namespace Neos\Neos\Fusion\Cache;
 
 use Neos\Flow\Annotations as Flow;
 use Neos\Cache\CacheAwareInterface;
@@ -32,7 +32,7 @@ private function __construct(
 
     public static function fromNode(Node $node): self
     {
-        return new self('Node_' . $node->subgraphIdentity->contentStreamId->value
+        return new self('Node_' . $node->workspaceName->value
             . '_' . $node->dimensionSpacePoint->hash
             . '_' .  $node->aggregateId->value);
     }

diff --git a/Neos.Neos/Classes/Fusion/Helper/CachingHelper.php b/Neos.Neos/Classes/Fusion/Helper/CachingHelper.php
@@ -22,7 +22,7 @@
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Eel\ProtectedContextAwareInterface;
 use Neos\Flow\Annotations as Flow;
-use Neos\Neos\Domain\Model\NodeCacheEntryIdentifier;
+use Neos\Neos\Fusion\Cache\NodeCacheEntryIdentifier;
 use Neos\Neos\Fusion\Cache\CacheTag;
 use Neos\Neos\Fusion\Cache\CacheTagSet;
 use Neos\Neos\Fusion\Cache\CacheTagWorkspaceName;
@@ -60,6 +60,14 @@ public function nodeTag(iterable|Node $nodes): array
         );
     }
 
+    /**
+     * Generate a `@cache` entry identifier for a given node:
+     *
+     *     entryIdentifier {
+     *       documentNode = ${Neos.Caching.entryIdentifierForNode(documentNode)}
+     *     }
+     *
+     */
     public function entryIdentifierForNode(Node $node): NodeCacheEntryIdentifier
     {
         return NodeCacheEntryIdentifier::fromNode($node);