Merge remote-tracking branch 'origin/9.0' into task/deprecate-Disable…

…NodeAggregate

Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentGraph.php

@@ -166,7 +166,7 @@ public function findNodeAggregateById(
         return $this->nodeFactory->mapNodeRowsToNodeAggregate(
             $this->fetchRows($queryBuilder),
             $this->workspaceName,
-            VisibilityConstraints::withoutRestrictions()
+            VisibilityConstraints::createEmpty()
         );
     }
 
@@ -274,7 +274,7 @@ public function findParentNodeAggregateByChildOriginDimensionSpacePoint(NodeAggr
         return $this->nodeFactory->mapNodeRowsToNodeAggregate(
             $this->fetchRows($queryBuilder),
             $this->workspaceName,
-            VisibilityConstraints::withoutRestrictions()
+            VisibilityConstraints::createEmpty()
         );
     }
 
@@ -368,7 +368,7 @@ private function mapQueryBuilderToNodeAggregate(QueryBuilder $queryBuilder): ?No
         return $this->nodeFactory->mapNodeRowsToNodeAggregate(
             $this->fetchRows($queryBuilder),
             $this->workspaceName,
-            VisibilityConstraints::withoutRestrictions()
+            VisibilityConstraints::createEmpty()
         );
     }
 
@@ -381,7 +381,7 @@ private function mapQueryBuilderToNodeAggregates(QueryBuilder $queryBuilder): No
         return $this->nodeFactory->mapNodeRowsToNodeAggregates(
             $this->fetchRows($queryBuilder),
             $this->workspaceName,
-            VisibilityConstraints::withoutRestrictions()
+            VisibilityConstraints::createEmpty()
         );
     }
 

Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentSubgraph.php

@@ -475,7 +475,7 @@ private function addSubtreeTagConstraints(QueryBuilder $queryBuilder, string $hi
     {
         $hierarchyRelationTablePrefix = $hierarchyRelationTableAlias === '' ? '' : $hierarchyRelationTableAlias . '.';
         $i = 0;
-        foreach ($this->visibilityConstraints->tagConstraints as $excludedTag) {
+        foreach ($this->visibilityConstraints->excludedSubtreeTags as $excludedTag) {
             $queryBuilder->andWhere('NOT JSON_CONTAINS_PATH(' . $hierarchyRelationTablePrefix . 'subtreetags, \'one\', :tagPath' . $i . ')')->setParameter('tagPath' . $i, '$.' . $excludedTag->value);
             $i++;
         }

Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentHypergraph.php

@@ -129,7 +129,7 @@ public function findNodeAggregateById(
 
         return $this->nodeFactory->mapNodeRowsToNodeAggregate(
             $nodeRows,
-            VisibilityConstraints::withoutRestrictions()
+            VisibilityConstraints::createEmpty()
         );
     }
 
@@ -173,7 +173,7 @@ public function findParentNodeAggregateByChildOriginDimensionSpacePoint(
 
         return $this->nodeFactory->mapNodeRowsToNodeAggregate(
             $nodeRows,
-            VisibilityConstraints::withoutRestrictions()
+            VisibilityConstraints::createEmpty()
         );
     }
 
@@ -187,7 +187,7 @@ public function findParentNodeAggregates(
 
         return $this->nodeFactory->mapNodeRowsToNodeAggregates(
             $nodeRows,
-            VisibilityConstraints::withoutRestrictions()
+            VisibilityConstraints::createEmpty()
         );
     }
 
@@ -217,7 +217,7 @@ public function findChildNodeAggregates(
 
         return $this->nodeFactory->mapNodeRowsToNodeAggregates(
             $nodeRows,
-            VisibilityConstraints::withoutRestrictions()
+            VisibilityConstraints::createEmpty()
         );
     }
 
@@ -236,7 +236,7 @@ public function findChildNodeAggregateByName(
 
         return $this->nodeFactory->mapNodeRowsToNodeAggregate(
             $nodeRows,
-            VisibilityConstraints::withoutRestrictions()
+            VisibilityConstraints::createEmpty()
         );
     }
 
@@ -252,7 +252,7 @@ public function findTetheredChildNodeAggregates(
 
         $nodeRows = $query->execute($this->dbal)->fetchAllAssociative();
 
-        return $this->nodeFactory->mapNodeRowsToNodeAggregates($nodeRows, VisibilityConstraints::withoutRestrictions());
+        return $this->nodeFactory->mapNodeRowsToNodeAggregates($nodeRows, VisibilityConstraints::createEmpty());
     }
 
     public function getDimensionSpacePointsOccupiedByChildNodeName(

Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/07-NodeRemoval/01-RemoveNodeAggregate_ConstraintChecks.feature

@@ -84,12 +84,3 @@ Feature: Remove NodeAggregate
       | coveredDimensionSpacePoint   | {"language": "en"}       |
       | nodeVariantSelectionStrategy | "allVariants"            |
     Then the last command should have thrown an exception of type "NodeAggregateDoesCurrentlyNotCoverDimensionSpacePoint"
-
-  Scenario: Try to remove a node aggregate using a non-existent removalAttachmentPoint
-    When the command RemoveNodeAggregate is executed with payload and exceptions are caught:
-      | Key                          | Value                    |
-      | nodeAggregateId              | "sir-david-nodenborough" |
-      | nodeVariantSelectionStrategy | "allVariants"            |
-      | coveredDimensionSpacePoint   | {"language":"de"}        |
-      | removalAttachmentPoint       | "i-do-not-exist"         |
-    Then the last command should have thrown an exception of type "NodeAggregateCurrentlyDoesNotExist"

Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/07-NodeRemoval/02-RemoveNodeAggregate_WithoutDimensions.feature

@@ -48,7 +48,6 @@ Feature: Remove NodeAggregate
       | nodeAggregateId                      | "nodingers-cat" |
       | affectedOccupiedDimensionSpacePoints | [[]]            |
       | affectedCoveredDimensionSpacePoints  | [[]]            |
-      | removalAttachmentPoint               | null            |
     Then I expect the graph projection to consist of exactly 2 nodes
     And I expect a node identified by cs-identifier;lady-eleonode-rootford;{} to exist in the content graph
     And I expect a node identified by cs-identifier;sir-david-nodenborough;{} to exist in the content graph

Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/07-NodeRemoval/03-RemoveNodeAggregate_WithDimensions.feature

@@ -51,7 +51,6 @@ Feature: Remove NodeAggregate
       | nodeAggregateId                      | "nodingers-cat"                        |
       | affectedOccupiedDimensionSpacePoints | [{"language":"en"}]                    |
       | affectedCoveredDimensionSpacePoints  | [{"language":"de"},{"language":"gsw"}] |
-      | removalAttachmentPoint               | null                                   |
     Then I expect the graph projection to consist of exactly 4 nodes
     And I expect a node identified by cs-identifier;lady-eleonode-rootford;{} to exist in the content graph
     And I expect a node identified by cs-identifier;sir-david-nodenborough;{"language":"en"} to exist in the content graph
@@ -198,7 +197,6 @@ Feature: Remove NodeAggregate
       | nodeAggregateId                      | "nodingers-cat"                                                            |
       | affectedOccupiedDimensionSpacePoints | [{"language":"de"},{"language":"en"}]                                      |
       | affectedCoveredDimensionSpacePoints  | [{"language":"de"},{"language":"en"},{"language":"gsw"},{"language":"fr"}] |
-      | removalAttachmentPoint               | null                                                                       |
     Then I expect the graph projection to consist of exactly 2 nodes
     And I expect a node identified by cs-identifier;lady-eleonode-rootford;{} to exist in the content graph
     And I expect a node identified by cs-identifier;sir-david-nodenborough;{"language":"en"} to exist in the content graph

Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/11-NodeTypeChange/02-ChangeNodeAggregateType_DeleteStrategy.feature

@@ -307,7 +307,6 @@ Feature: Change node aggregate type - behavior of DELETE strategy
       | nodeAggregateId                      | "nodingers-cat"                        |
       | affectedOccupiedDimensionSpacePoints | [{"language":"de"},{"language":"gsw"}] |
       | affectedCoveredDimensionSpacePoints  | [{"language":"de"},{"language":"gsw"}] |
-      | removalAttachmentPoint               | null                                   |
     And event at index 14 is of type "NodeAggregateTypeWasChanged" with payload:
       | Key             | Expected                                             |
       | workspaceName   | "live"                                               |

Neos.ContentRepository.BehavioralTests/Tests/Parallel/ParallelWritingInWorkspaces/ParallelWritingInWorkspacesTest.php

@@ -178,7 +178,7 @@ public function whileANodesArWrittenOnLive(): void
         $this->log('1. writing finished');
         Assert::assertTrue(true, 'No exception was thrown ;)');
 
-        $subgraph = $this->contentRepository->getContentGraph(WorkspaceName::forLive())->getSubgraph(DimensionSpacePoint::createWithoutDimensions(), VisibilityConstraints::withoutRestrictions());
+        $subgraph = $this->contentRepository->getContentGraph(WorkspaceName::forLive())->getSubgraph(DimensionSpacePoint::createWithoutDimensions(), VisibilityConstraints::createEmpty());
         $node = $subgraph->findNodeById(NodeAggregateId::fromString('nody-mc-nodeface-100'));
         Assert::assertNotNull($node);
     }
@@ -220,7 +220,7 @@ public function thenConcurrentPublishLeadsToException(): void
 
         Assert::assertTrue(true, 'No exception was thrown ;)');
 
-        $subgraph = $this->contentRepository->getContentGraph(WorkspaceName::fromString('user-test'))->getSubgraph(DimensionSpacePoint::createWithoutDimensions(), VisibilityConstraints::withoutRestrictions());
+        $subgraph = $this->contentRepository->getContentGraph(WorkspaceName::fromString('user-test'))->getSubgraph(DimensionSpacePoint::createWithoutDimensions(), VisibilityConstraints::createEmpty());
         $node = $subgraph->findNodeById(NodeAggregateId::fromString('user-nody-mc-nodeface-100'));
         Assert::assertNotNull($node);
     }

Neos.ContentRepository.BehavioralTests/Tests/Parallel/WorkspacePublicationDuringWriting/WorkspacePublicationDuringWritingTest.php

@@ -169,7 +169,7 @@ public function whileANodesArWrittenOnLive(): void
         $this->log('writing finished');
         Assert::assertTrue(true, 'No exception was thrown ;)');
 
-        $subgraph = $this->contentRepository->getContentGraph(WorkspaceName::forLive())->getSubgraph(DimensionSpacePoint::createWithoutDimensions(), VisibilityConstraints::withoutRestrictions());
+        $subgraph = $this->contentRepository->getContentGraph(WorkspaceName::forLive())->getSubgraph(DimensionSpacePoint::createWithoutDimensions(), VisibilityConstraints::createEmpty());
         $node = $subgraph->findNodeById(NodeAggregateId::fromString('nody-mc-nodeface'));
         Assert::assertNotNull($node);
         Assert::assertSame($node->getProperty('title'), 'changed-title-50');
@@ -253,7 +253,7 @@ public function thenConcurrentPublishLeadsToException(): void
         }
 
         $node = $this->contentRepository->getContentGraph(WorkspaceName::fromString('user-test'))
-            ->getSubgraph(DimensionSpacePoint::createWithoutDimensions(), VisibilityConstraints::withoutRestrictions())
+            ->getSubgraph(DimensionSpacePoint::createWithoutDimensions(), VisibilityConstraints::createEmpty())
             ->findNodeById(NodeAggregateId::fromString('nody-mc-nodeface'));
 
         Assert::assertSame('written-after-failed-publish', $node?->getProperty('title'));

Neos.ContentRepository.BehavioralTests/Tests/Parallel/WorkspaceWritingDuringRebase/WorkspaceWritingDuringRebaseTest.php

@@ -209,7 +209,7 @@ public function thenConcurrentCommandsLeadToAnException(): void
         $this->log('write finished');
 
         $node = $this->contentRepository->getContentGraph(WorkspaceName::fromString('user-test'))
-            ->getSubgraph(DimensionSpacePoint::createWithoutDimensions(), VisibilityConstraints::withoutRestrictions())
+            ->getSubgraph(DimensionSpacePoint::createWithoutDimensions(), VisibilityConstraints::createEmpty())
             ->findNodeById(NodeAggregateId::fromString('nody-mc-nodeface'));
 
         if ($actualException === null) {

Neos.ContentRepository.Core/Classes/Feature/Common/ConstraintChecks.php

@@ -551,15 +551,15 @@ protected function requireNodeAggregateToBeSibling(
     ): void {
         $succeedingSiblings = $contentGraph->getSubgraph(
             $dimensionSpacePoint,
-            VisibilityConstraints::withoutRestrictions()
+            VisibilityConstraints::createEmpty()
         )->findSucceedingSiblingNodes($referenceNodeAggregateId, FindSucceedingSiblingNodesFilter::create());
         if ($succeedingSiblings->toNodeAggregateIds()->contain($siblingNodeAggregateId)) {
             return;
         }
 
         $precedingSiblings = $contentGraph->getSubgraph(
             $dimensionSpacePoint,
-            VisibilityConstraints::withoutRestrictions()
+            VisibilityConstraints::createEmpty()
         )->findPrecedingSiblingNodes($referenceNodeAggregateId, FindPrecedingSiblingNodesFilter::create());
         if ($precedingSiblings->toNodeAggregateIds()->contain($siblingNodeAggregateId)) {
             return;
@@ -583,7 +583,7 @@ protected function requireNodeAggregateToBeChild(
     ): void {
         $childNodes = $contentGraph->getSubgraph(
             $dimensionSpacePoint,
-            VisibilityConstraints::withoutRestrictions()
+            VisibilityConstraints::createEmpty()
         )->findChildNodes($parentNodeAggregateId, FindChildNodesFilter::create());
         if ($childNodes->toNodeAggregateIds()->contain($childNodeAggregateId)) {
             return;

Neos.ContentRepository.Core/Classes/Feature/Common/NodeCreationInternals.php

@@ -45,15 +45,15 @@ private function resolveInterdimensionalSiblingsForCreation(
         OriginDimensionSpacePoint $sourceOrigin,
         DimensionSpacePointSet $coveredDimensionSpacePoints,
     ): InterdimensionalSiblings {
-        $subGraph = $contentGraph->getSubgraph($sourceOrigin->toDimensionSpacePoint(), VisibilityConstraints::withoutRestrictions());
+        $subGraph = $contentGraph->getSubgraph($sourceOrigin->toDimensionSpacePoint(), VisibilityConstraints::createEmpty());
         $originAlternativeSucceedingSiblings = $subGraph->findSucceedingSiblingNodes(
             $requestedSucceedingSiblingNodeAggregateId,
             FindSucceedingSiblingNodesFilter::create()
         );
 
         $interdimensionalSiblings = [];
         foreach ($coveredDimensionSpacePoints as $coveredDimensionSpacePoint) {
-            $subGraph = $contentGraph->getSubgraph($coveredDimensionSpacePoint, VisibilityConstraints::withoutRestrictions());
+            $subGraph = $contentGraph->getSubgraph($coveredDimensionSpacePoint, VisibilityConstraints::createEmpty());
             $variantSucceedingSibling = $subGraph->findNodeById($requestedSucceedingSiblingNodeAggregateId);
             if ($variantSucceedingSibling) {
                 // a) happy path, the explicitly requested succeeding sibling also exists in this dimension space point

Neos.ContentRepository.Core/Classes/Feature/Common/NodeTypeChangeInternals.php

@@ -194,7 +194,7 @@ private function findDimensionSpacePointsConnectingParentAndChildAggregate(
     ): DimensionSpacePointSet {
         $points = [];
         foreach ($childNodeAggregate->coveredDimensionSpacePoints as $coveredDimensionSpacePoint) {
-            $parentNode = $contentGraph->getSubgraph($coveredDimensionSpacePoint, VisibilityConstraints::withoutRestrictions())->findParentNode(
+            $parentNode = $contentGraph->getSubgraph($coveredDimensionSpacePoint, VisibilityConstraints::createEmpty())->findParentNode(
                 $childNodeAggregate->nodeAggregateId
             );
             if (

Neos.ContentRepository.Core/Classes/Feature/Common/NodeVariationInternals.php

@@ -276,14 +276,14 @@ private function resolveInterdimensionalSiblings(
         DimensionSpacePointSet $variantCoverage,
     ): InterdimensionalSiblings {
         $originSiblings = $contentGraph
-            ->getSubgraph($sourceOrigin->toDimensionSpacePoint(), VisibilityConstraints::withoutRestrictions())
+            ->getSubgraph($sourceOrigin->toDimensionSpacePoint(), VisibilityConstraints::createEmpty())
             ->findSucceedingSiblingNodes($varyingNodeAggregateId, FindSucceedingSiblingNodesFilter::create());
 
         $interdimensionalSiblings = [];
         foreach ($variantCoverage as $variantDimensionSpacePoint) {
             // check the siblings succeeding in the origin dimension space point
             foreach ($originSiblings as $originSibling) {
-                $variantSibling = $contentGraph->getSubgraph($variantDimensionSpacePoint, VisibilityConstraints::withoutRestrictions())->findNodeById($originSibling->aggregateId);
+                $variantSibling = $contentGraph->getSubgraph($variantDimensionSpacePoint, VisibilityConstraints::createEmpty())->findNodeById($originSibling->aggregateId);
                 if (!$variantSibling) {
                     continue;
                 }

Neos.ContentRepository.Core/Classes/Feature/DimensionSpaceAdjustment/DimensionSpaceCommandHandler.php

@@ -142,7 +142,7 @@ private static function requireDimensionSpacePointToBeEmptyInContentStream(
         ContentGraphInterface $contentGraph,
         DimensionSpacePoint $dimensionSpacePoint
     ): void {
-        $hasNodes = $contentGraph->getSubgraph($dimensionSpacePoint, VisibilityConstraints::withoutRestrictions())->countNodes();
+        $hasNodes = $contentGraph->getSubgraph($dimensionSpacePoint, VisibilityConstraints::createEmpty())->countNodes();
         if ($hasNodes > 0) {
             throw new DimensionSpacePointAlreadyExists(sprintf(
                 'the content stream %s already contained nodes in dimension space point %s - this is not allowed.',

Neos.ContentRepository.Core/Classes/Feature/NodeMove/NodeMove.php

@@ -249,7 +249,7 @@ private function resolveInterdimensionalSiblingsForMove(
     ): InterdimensionalSiblings {
         $selectedSubgraph = $contentGraph->getSubgraph(
             $selectedDimensionSpacePoint,
-            VisibilityConstraints::withoutRestrictions()
+            VisibilityConstraints::createEmpty()
         );
         $alternativeSucceedingSiblingIds = $succeedingSiblingId
             ? $selectedSubgraph->findSucceedingSiblingNodes(
@@ -268,7 +268,7 @@ private function resolveInterdimensionalSiblingsForMove(
         foreach ($affectedDimensionSpacePoints as $dimensionSpacePoint) {
             $variantSubgraph = $contentGraph->getSubgraph(
                 $dimensionSpacePoint,
-                VisibilityConstraints::withoutRestrictions()
+                VisibilityConstraints::createEmpty()
             );
             if ($succeedingSiblingId) {
                 $variantSucceedingSibling = $variantSubgraph->findNodeById($succeedingSiblingId);

Neos.ContentRepository.Core/Classes/Feature/NodeRemoval/Command/RemoveNodeAggregate.php

@@ -31,20 +31,25 @@
     \JsonSerializable,
     RebasableToOtherWorkspaceInterface
 {
+    /**
+     * @deprecated with Neos 9 Beta 19. Must not be specified any longer. Might get removed at any point. Only part of the command to handle rebasing legacy events.
+     */
+    public ?NodeAggregateId $removalAttachmentPoint;
+
     /**
      * @param WorkspaceName $workspaceName The workspace in which the remove operation is to be performed
      * @param NodeAggregateId $nodeAggregateId The identifier of the node aggregate to remove
      * @param DimensionSpacePoint $coveredDimensionSpacePoint One of the dimension space points covered by the node aggregate in which the user intends to remove it
      * @param NodeVariantSelectionStrategy $nodeVariantSelectionStrategy The strategy the user chose to determine which specialization variants will also be removed
-     * @param NodeAggregateId|null $removalAttachmentPoint Internal. It stores the document node id of the removed node, as that is what the UI needs later on for the change display. {@see self::withRemovalAttachmentPoint()}
      */
     private function __construct(
         public WorkspaceName $workspaceName,
         public NodeAggregateId $nodeAggregateId,
         public DimensionSpacePoint $coveredDimensionSpacePoint,
         public NodeVariantSelectionStrategy $nodeVariantSelectionStrategy,
-        public ?NodeAggregateId $removalAttachmentPoint
+        ?NodeAggregateId $removalAttachmentPoint
     ) {
+        $this->removalAttachmentPoint = $removalAttachmentPoint;
     }
 
     /**
@@ -71,23 +76,6 @@ public static function fromArray(array $array): self
         );
     }
 
-    /**
-     * This adds usually the NodeAggregateId of the parent document node of the deleted node.
-     * It is needed for instance in the Neos UI for the following scenario:
-     * - when removing a node, you still need to be able to publish the removal.
-     * - For this to work, the Neos UI needs to know the id of the removed Node, **on the page where the removal happened**
-     *   (so that the user can decide to publish a single page INCLUDING the removal on the page)
-     * - Because this command will *remove* the edge,
-     *   we cannot know the position in the tree after doing the removal anymore.
-     *
-     * @param NodeAggregateId $removalAttachmentPoint
-     * @internal
-     */
-    public function withRemovalAttachmentPoint(NodeAggregateId $removalAttachmentPoint): self
-    {
-        return new self($this->workspaceName, $this->nodeAggregateId, $this->coveredDimensionSpacePoint, $this->nodeVariantSelectionStrategy, $removalAttachmentPoint);
-    }
-
     /**
      * @return array<string,mixed>
      */
@@ -104,7 +92,7 @@ public function createCopyForWorkspace(
             $this->nodeAggregateId,
             $this->coveredDimensionSpacePoint,
             $this->nodeVariantSelectionStrategy,
-            $this->removalAttachmentPoint,
+            $this->removalAttachmentPoint
         );
     }
 }