TASK: Provide alternative for NodeDiscriminator::fromNode that doesnt use Nodes content stream

Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/CRTestSuiteRuntimeVariables.php

@@ -17,8 +17,8 @@
 use Neos\ContentRepository\Core\ContentGraphFinder;
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;
+use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphInterface;
 use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface;
-use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate;
 use Neos\ContentRepository\Core\Projection\ContentGraph\NodePath;
 use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
@@ -29,6 +29,8 @@
 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\ContentStreamAwareNode;
+use PHPUnit\Framework\Assert;
 
 /**
  * The node creation trait for behavioral tests
@@ -49,7 +51,11 @@ trait CRTestSuiteRuntimeVariables
 
     protected ?\Exception $lastCommandException = null;
 
-    protected ?Node $currentNode = null;
+    /**
+     * 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 ?ContentStreamAwareNode $currentNode = null;
 
     protected ?NodeAggregate $currentNodeAggregate = null;
 
@@ -147,16 +153,22 @@ public function visibilityConstraintsAreSetTo(string $restrictionType): void
         };
     }
 
-    public function getCurrentSubgraph(): ContentSubgraphInterface
+    public function getCurrentContentGraph(): ContentGraphInterface
     {
+        // todo cache content graph per test run??? Otherwise it will be flushed too often?
         $contentGraphFinder = $this->currentContentRepository->projectionState(ContentGraphFinder::class);
         $contentGraphFinder->forgetInstances();
-        if (isset($this->currentContentStreamId)) {
+        if ($this->currentContentStreamId !== null) {
             // This must still be supported for low level tests, e.g. for content stream forking
-            return $contentGraphFinder->getByWorkspaceNameAndContentStreamId($this->currentWorkspaceName, $this->currentContentStreamId)->getSubgraph($this->currentDimensionSpacePoint, $this->currentVisibilityConstraints);
+            return $contentGraphFinder->getByWorkspaceNameAndContentStreamId($this->currentWorkspaceName, $this->currentContentStreamId);
         }
 
-        return $contentGraphFinder->getByWorkspaceName($this->currentWorkspaceName)->getSubgraph(
+        return $contentGraphFinder->getByWorkspaceName($this->currentWorkspaceName);
+    }
+
+    public function getCurrentSubgraph(): ContentSubgraphInterface
+    {
+        return $this->getCurrentContentGraph()->getSubgraph(
             $this->currentDimensionSpacePoint,
             $this->currentVisibilityConstraints
         );
@@ -175,7 +187,12 @@ public function iRememberNodeAggregateIdOfNodesChildAs(string $parentNodeAggrega
 
     protected function getCurrentNodeAggregateId(): NodeAggregateId
     {
-        assert($this->currentNode instanceof Node);
+        $this->expectCurrentNode();
         return $this->currentNode->aggregateId;
     }
+
+    protected function expectCurrentNode(): void
+    {
+        Assert::assertNotNull($this->currentNode, 'No current node present');
+    }
 }

Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Features/NodeCopying.php

@@ -59,7 +59,7 @@ public function theCommandCopyNodesRecursivelyIsExecutedCopyingTheCurrentNodeAgg
         $command = CopyNodesRecursively::createFromSubgraphAndStartNode(
             $subgraph,
             $workspaceName,
-            $this->currentNode,
+            $this->currentNode->nodeInstance,
             $targetDimensionSpacePoint,
             NodeAggregateId::fromString($commandArguments['targetParentNodeAggregateId']),
             $targetSucceedingSiblingNodeAggregateId,

Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Helpers/ContentStreamAwareNode.php

@@ -0,0 +1,30 @@
+<?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\Node\NodeAggregateId;
+use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
+
+final readonly class ContentStreamAwareNode
+{
+    private function __construct(
+        public ContentStreamId $contentStreamId,
+        public Node $nodeInstance,
+        /** Alias for $currentNode->instance->aggregateId */
+        public NodeAggregateId $aggregateId,
+    ) {
+    }
+
+    public static function create(ContentStreamId $contentStreamId, Node $node): self
+    {
+        return new self($contentStreamId, $node, $node->aggregateId);
+    }
+
+    public function builder(): ContentStreamAwareNodeBuilder
+    {
+        return ContentStreamAwareNodeBuilder::create($this->contentStreamId);
+    }
+}

Neos.ContentRepository.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);
+    }
+}

Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Helpers/NodeDiscriminator.php

@@ -15,6 +15,7 @@
 namespace Neos\ContentRepository\TestSuite\Behavior\Features\Bootstrap\Helpers;
 
 use Neos\ContentRepository\Core\DimensionSpace\OriginDimensionSpacePoint;
+use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphInterface;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
@@ -47,12 +48,12 @@ public static function fromShorthand(string $shorthand): self
         );
     }
 
-    public static function fromNode(Node $node): self
+    public static function fromNode(ContentStreamAwareNode $contentStreamAwareNode): self
     {
         return new self(
-            $node->subgraphIdentity->contentStreamId,
-            $node->aggregateId,
-            $node->originDimensionSpacePoint
+            $contentStreamAwareNode->contentStreamId,
+            $contentStreamAwareNode->nodeInstance->aggregateId,
+            $contentStreamAwareNode->nodeInstance->originDimensionSpacePoint
         );
     }
 

Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Helpers/NodeDiscriminators.php

@@ -53,14 +53,6 @@ public static function fromArray(array $array): self
         ));
     }
 
-    public static function fromNodes(Nodes $nodes): self
-    {
-        return new self(...array_map(
-            fn (Node $node): NodeDiscriminator => NodeDiscriminator::fromNode($node),
-            iterator_to_array($nodes)
-        ));
-    }
-
     public function equal(self $other): bool
     {
         return $this->discriminators == $other->discriminators;