Merge pull request #5066 from neos/task/removeReferencesToDeprecateNo…

…deReadModelProperties TASK: Remove references to deprecate node read model properties
neos · May 19, 2024 · 8e5b846 · 8e5b846
2 parents 612ced2 + 5f398b3
commit 8e5b846
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Adjustment/DisallowedChildNodeAdjustment.php b/src/Adjustment/DisallowedChildNodeAdjustment.php
@@ -58,7 +58,7 @@ public function findAdjustmentsForNodeType(NodeTypeName $nodeTypeName): \Generat
 
                 $parentNode = $subgraph->findParentNode($nodeAggregate->nodeAggregateId);
                 $grandparentNode = $parentNode !== null
-                    ? $subgraph->findParentNode($parentNode->nodeAggregateId)
+                    ? $subgraph->findParentNode($parentNode->aggregateId)
                     : null;
 
                 $allowedByParent = true;

diff --git a/src/Adjustment/PropertyAdjustment.php b/src/Adjustment/PropertyAdjustment.php
@@ -117,7 +117,7 @@ private function publishNodePropertiesWereSet(
             new NodePropertiesWereSet(
                 $node->workspaceName,
                 $node->subgraphIdentity->contentStreamId,
-                $node->nodeAggregateId,
+                $node->aggregateId,
                 $node->originDimensionSpacePoint,
                 $nodeAggregate->getCoverageByOccupant($node->originDimensionSpacePoint),
                 $serializedPropertyValues,

diff --git a/src/Adjustment/TetheredNodeAdjustments.php b/src/Adjustment/TetheredNodeAdjustments.php
@@ -130,8 +130,8 @@ function () use ($tetheredNodeAggregate) {
                     $actualTetheredChildNodes = [];
                     foreach ($childNodes as $childNode) {
                         if ($childNode->classification->isTethered()) {
-                            assert($childNode->nodeName !== null); // it's tethered!
-                            $actualTetheredChildNodes[$childNode->nodeName->value] = $childNode;
+                            assert($childNode->name !== null); // it's tethered!
+                            $actualTetheredChildNodes[$childNode->name->value] = $childNode;
                         }
                     }
 
@@ -224,14 +224,14 @@ private function reorderNodes(
             foreach ($coverageByOrigin as $coveredDimensionSpacePoint) {
                 $succeedingSiblingsForCoverage[] = new InterdimensionalSibling(
                     $coveredDimensionSpacePoint,
-                    $succeedingNode->nodeAggregateId
+                    $succeedingNode->aggregateId
                 );
             }
 
             $events[] = new NodeAggregateWasMoved(
                 $workspaceName,
                 $contentStreamId,
-                $nodeToMove->nodeAggregateId,
+                $nodeToMove->aggregateId,
                 null,
                 new InterdimensionalSiblings(...$succeedingSiblingsForCoverage),
             );