TASK: Introduce ContentStreamAwareNodeBuilder to simplify creating …

…`ContentStreamAwareNode`
neos · Jun 16, 2024 · 6101daf · 6101daf
1 parent 313656c
commit 6101daf
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 53 deletions.
diff --git a/...tRepository.TestSuite/Classes/Behavior/Features/Bootstrap/CRTestSuiteRuntimeVariables.php b/...tRepository.TestSuite/Classes/Behavior/Features/Bootstrap/CRTestSuiteRuntimeVariables.php
@@ -29,7 +29,7 @@
 use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 use Neos\ContentRepository\TestSuite\Behavior\Features\Bootstrap\Helpers\FakeClock;
 use Neos\ContentRepository\TestSuite\Behavior\Features\Bootstrap\Helpers\FakeUserIdProvider;
-use Neos\ContentRepository\TestSuite\Behavior\Features\Bootstrap\Helpers\NodeWithContentStreamId;
+use Neos\ContentRepository\TestSuite\Behavior\Features\Bootstrap\Helpers\ContentStreamAwareNode;
 use PHPUnit\Framework\Assert;
 
 /**
@@ -55,7 +55,7 @@ trait CRTestSuiteRuntimeVariables
      * The Node's content stream id doesn't necessarily have to match with {@see $currentContentStreamId} if the node was initialized via the content graph from another workspace
      * thus we have to track it as well.
      */
-    protected ?NodeWithContentStreamId $currentNode = null;
+    protected ?ContentStreamAwareNode $currentNode = null;
 
     protected ?NodeAggregate $currentNodeAggregate = null;
 
@@ -166,9 +166,9 @@ public function getCurrentContentGraph(): ContentGraphInterface
         return $contentGraphFinder->getByWorkspaceName($this->currentWorkspaceName);
     }
 
-    public function getCurrentSubgraph(?ContentGraphInterface $contentGraphToUse = null): ContentSubgraphInterface
+    public function getCurrentSubgraph(): ContentSubgraphInterface
     {
-        return ($contentGraphToUse ?? $this->getCurrentContentGraph())->getSubgraph(
+        return $this->getCurrentContentGraph()->getSubgraph(
             $this->currentDimensionSpacePoint,
             $this->currentVisibilityConstraints
         );

diff --git a/....ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Features/NodeCopying.php b/....ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Features/NodeCopying.php
@@ -59,7 +59,7 @@ public function theCommandCopyNodesRecursivelyIsExecutedCopyingTheCurrentNodeAgg
         $command = CopyNodesRecursively::createFromSubgraphAndStartNode(
             $subgraph,
             $workspaceName,
-            $this->currentNode->instance,
+            $this->currentNode->nodeInstance,
             $targetDimensionSpacePoint,
             NodeAggregateId::fromString($commandArguments['targetParentNodeAggregateId']),
             $targetSucceedingSiblingNodeAggregateId,

diff --git a/...strap/Helpers/NodeWithContentStreamId.php → ...tstrap/Helpers/ContentStreamAwareNode.php b/...strap/Helpers/NodeWithContentStreamId.php → ...tstrap/Helpers/ContentStreamAwareNode.php
@@ -8,22 +8,23 @@
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
 
-final readonly class NodeWithContentStreamId
+final readonly class ContentStreamAwareNode
 {
     private function __construct(
-        public NodeAggregateId $aggregateId,
-        public Node $instance,
         public ContentStreamId $contentStreamId,
+        public Node $nodeInstance,
+        /** Alias for $currentNode->instance->aggregateId */
+        public NodeAggregateId $aggregateId,
     ) {
     }
 
-    public static function create(Node $node, ContentStreamId $contentStreamId): self
+    public static function create(ContentStreamId $contentStreamId, Node $node): self
     {
-        return new self($node->aggregateId, $node, $contentStreamId);
+        return new self($contentStreamId, $node, $node->aggregateId);
     }
 
-    public function withNode(Node $node): self
+    public function builder(): ContentStreamAwareNodeBuilder
     {
-        return new self($node->aggregateId, $node, $this->contentStreamId);
+        return ContentStreamAwareNodeBuilder::create($this->contentStreamId);
     }
 }
diff --git a/...y.TestSuite/Classes/Behavior/Features/Bootstrap/Helpers/ContentStreamAwareNodeBuilder.php b/...y.TestSuite/Classes/Behavior/Features/Bootstrap/Helpers/ContentStreamAwareNodeBuilder.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neos\ContentRepository\TestSuite\Behavior\Features\Bootstrap\Helpers;
+
+use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
+use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
+
+final readonly class ContentStreamAwareNodeBuilder
+{
+    private function __construct(
+        private ContentStreamId $contentStreamId
+    ) {
+    }
+
+    public static function create(ContentStreamId $contentStreamId): self
+    {
+        return new self($contentStreamId);
+    }
+
+    public function buildNode(Node $node): ContentStreamAwareNode
+    {
+        return ContentStreamAwareNode::create($this->contentStreamId, $node);
+    }
+}
diff --git a/...entRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Helpers/NodeDiscriminator.php b/...entRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Helpers/NodeDiscriminator.php
@@ -37,15 +37,6 @@ private function __construct(
     ) {
     }
 
-    public static function create(ContentStreamId $contentStreamId, OriginDimensionSpacePoint $originDimensionSpacePoint, NodeAggregateId $aggregateId): self
-    {
-        return new self(
-            $contentStreamId,
-            $aggregateId,
-            $originDimensionSpacePoint
-        );
-    }
-
     public static function fromShorthand(string $shorthand): self
     {
         list($contentStreamId, $nodeAggregateId, $originDimensionSpacePoint) = explode(';', $shorthand);
@@ -57,12 +48,12 @@ public static function fromShorthand(string $shorthand): self
         );
     }
 
-    public static function fromNode(NodeWithContentStreamId $decorated): self
+    public static function fromNode(ContentStreamAwareNode $contentStreamAwareNode): self
     {
         return new self(
-            $decorated->contentStreamId,
-            $decorated->instance->aggregateId,
-            $decorated->instance->originDimensionSpacePoint
+            $contentStreamAwareNode->contentStreamId,
+            $contentStreamAwareNode->nodeInstance->aggregateId,
+            $contentStreamAwareNode->nodeInstance->originDimensionSpacePoint
         );
     }