FIX: Remove generalisations dsp with all its fallbacks

Also mark empty dimensions as affected source, but that will be removed wither way with: neos/neos-development-collection#5516

because its wrong.

Author: mhsdesign

Classes/Feature/Common/ConstraintChecks.php

@@ -698,19 +698,24 @@ protected function getExpectedVersionOfContentStream(
         );
     }
 
-    protected function requireDescendantNodesToNotFallbackToDimensionPointSet(NodeAggregateId $nodeAggregateId, ContentGraphInterface $contentGraph, DimensionSpacePointSet $disallowedDimensionSpacePointFallbackSet): void
+    protected function requireDescendantNodesToNotFallbackToDimensionPointSet(NodeAggregateId $nodeAggregateId, ContentGraphInterface $contentGraph, DimensionSpacePointSet $dimensionSpacePointsToBeRemoved): void
     {
         foreach ($contentGraph->findChildNodeAggregates($nodeAggregateId) as $childNodeAggregate) {
             foreach ($childNodeAggregate->occupiedDimensionSpacePoints as $occupiedDimensionSpacePoint) {
-                if (!$disallowedDimensionSpacePointFallbackSet->contains($occupiedDimensionSpacePoint->toDimensionSpacePoint())) {
+                if (!$dimensionSpacePointsToBeRemoved->contains($occupiedDimensionSpacePoint->toDimensionSpacePoint())) {
                     continue;
                 }
-                $fallbackDimensions = $childNodeAggregate->getCoverageByOccupant($occupiedDimensionSpacePoint)->getDifference(DimensionSpacePointSet::fromArray([$occupiedDimensionSpacePoint->toDimensionSpacePoint()]));
-                if (!$fallbackDimensions->isEmpty()) {
-                    throw new NodeAggregateDoesCurrentlyNotOccupyDimensionSpacePoint(sprintf('Descendant Node %s in dimensions %s must not fallback to dimension %s which will be removed.', $childNodeAggregate->nodeAggregateId, $fallbackDimensions->toJson(), $occupiedDimensionSpacePoint->toJson()));
+                $fallbackRemainingDimensions = $childNodeAggregate
+                    ->getCoverageByOccupant($occupiedDimensionSpacePoint)
+                    // exclude the occupied e.g. non fallback dimension itself
+                    ->getDifference(DimensionSpacePointSet::fromArray([$occupiedDimensionSpacePoint->toDimensionSpacePoint()]))
+                    // exclude all about to removed fallback dimensions
+                    ->getDifference($dimensionSpacePointsToBeRemoved);
+                if (!$fallbackRemainingDimensions->isEmpty()) {
+                    throw new NodeAggregateDoesCurrentlyNotOccupyDimensionSpacePoint(sprintf('Descendant Node %s in dimensions %s must not fallback to dimension %s which will be removed.', $childNodeAggregate->nodeAggregateId, $fallbackRemainingDimensions->toJson(), $occupiedDimensionSpacePoint->toJson()));
                 }
             }
-            $this->requireDescendantNodesToNotFallbackToDimensionPointSet($childNodeAggregate->nodeAggregateId, $contentGraph, $disallowedDimensionSpacePointFallbackSet);
+            $this->requireDescendantNodesToNotFallbackToDimensionPointSet($childNodeAggregate->nodeAggregateId, $contentGraph, $dimensionSpacePointsToBeRemoved);
         }
     }
 }

Classes/Feature/RootNodeCreation/RootNodeHandling.php

@@ -177,15 +177,14 @@ private function handleUpdateRootNodeAggregateDimensions(
         $events = [];
         if (!$removedDimensionSpacePoints->isEmpty()) {
             $this->requireDescendantNodesToNotFallbackToDimensionPointSet($rootNodeAggregate->nodeAggregateId, $contentGraph, $removedDimensionSpacePoints);
-            foreach ($removedDimensionSpacePoints as $removedDimensionSpacePoint) {
-                $events[] = new NodeAggregateWasRemoved(
-                    $contentGraph->getWorkspaceName(),
-                    $contentGraph->getContentStreamId(),
-                    $rootNodeAggregate->nodeAggregateId,
-                    new OriginDimensionSpacePointSet([OriginDimensionSpacePoint::fromDimensionSpacePoint($removedDimensionSpacePoint)]),
-                    new DimensionSpacePointSet([$removedDimensionSpacePoint]),
-                );
-            }
+            $events[] = new NodeAggregateWasRemoved(
+                $contentGraph->getWorkspaceName(),
+                $contentGraph->getContentStreamId(),
+                $rootNodeAggregate->nodeAggregateId,
+                // TODO root nodes never occupy, but this field is odd, unused and to be removed either way: https://github.com/neos/neos-development-collection/pull/5516
+                affectedOccupiedDimensionSpacePoints: OriginDimensionSpacePointSet::fromArray([]),
+                affectedCoveredDimensionSpacePoints: $removedDimensionSpacePoints,
+            );
         }
 
         if (!$newDimensionSpacePoints->isEmpty()) {