TASK: Fix flowqueries to use new aggregateId

neos · Jul 3, 2024 · 8d9a01f · 8d9a01f
1 parent 157ebc6
commit 8d9a01f
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 8 deletions.
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ClosestOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ClosestOperation.php
@@ -64,6 +64,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
         }
 
         $output = [];
+        /** @var Node $contextNode */
         foreach ($flowQuery->getContext() as $contextNode) {
             $contextNodeQuery = new FlowQuery([$contextNode]);
             $contextNodeQuery->pushOperation('first', []);

diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextAllOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextAllOperation.php
@@ -68,9 +68,10 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
         $output = [];
         $outputNodePaths = [];
         foreach ($flowQuery->getContext() as $contextNode) {
+            /** @var Node $contextNode */
             $nextNodes = $this->contentRepositoryRegistry->subgraphForNode($contextNode)
                 ->findSucceedingSiblingNodes(
-                    $contextNode->nodeAggregateId,
+                    $contextNode->aggregateId,
                     FindSucceedingSiblingNodesFilter::create()
                 );
             foreach ($nextNodes as $nextNode) {

diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextOperation.php
@@ -69,9 +69,10 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
         $output = [];
         $outputNodePaths = [];
         foreach ($flowQuery->getContext() as $contextNode) {
+            /** @var Node $contextNode */
             $nextNode = $this->contentRepositoryRegistry->subgraphForNode($contextNode)
                 ->findSucceedingSiblingNodes(
-                    $contextNode->nodeAggregateId,
+                    $contextNode->aggregateId,
                     FindSucceedingSiblingNodesFilter::create()
                 )->first();
             if ($nextNode !== null && !isset($outputNodePaths[$nextNode->aggregateId->value])) {

diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextUntilOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextUntilOperation.php
@@ -72,9 +72,10 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
         $outputNodeIdentifiers = [];
 
         foreach ($flowQuery->getContext() as $contextNode) {
+            /** @var Node $contextNode */
             $nextNodes = $this->contentRepositoryRegistry->subgraphForNode($contextNode)
                 ->findSucceedingSiblingNodes(
-                    $contextNode->nodeAggregateId,
+                    $contextNode->aggregateId,
                     FindSucceedingSiblingNodesFilter::create()
                 );
             if (isset($arguments[0]) && !empty($arguments[0])) {

diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentOperation.php
@@ -66,8 +66,8 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
     {
         $output = [];
         $outputNodeAggregateIds = [];
+        /** @var Node $contextNode */
         foreach ($flowQuery->getContext() as $contextNode) {
-            /* @var $contextNode Node */
             $parentNode = $this->contentRepositoryRegistry->subgraphForNode($contextNode)
                 ->findParentNode($contextNode->aggregateId);
             if ($parentNode === null) {

diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentsUntilOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentsUntilOperation.php
@@ -78,9 +78,10 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
                 NodeTypeNames::with(NodeTypeNameFactory::forRoot())
             )
         );
+        /** @var Node $contextNode */
         foreach ($flowQuery->getContext() as $contextNode) {
             $parentNodes = $this->contentRepositoryRegistry->subgraphForNode($contextNode)
-                ->findAncestorNodes($contextNode->nodeAggregateId, $findAncestorNodesFilter);
+                ->findAncestorNodes($contextNode->aggregateId, $findAncestorNodesFilter);
             if (isset($arguments[0]) && !empty($arguments[0] && !$parentNodes->isEmpty())) {
                 $filterQuery = new FlowQuery(iterator_to_array($parentNodes));
                 $filterQuery->pushOperation('filter', [$arguments[0]]);

diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevAllOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevAllOperation.php
@@ -67,10 +67,11 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
     {
         $output = [];
         $outputNodeAggregateIds = [];
+        /** @var Node $contextNode */
         foreach ($flowQuery->getContext() as $contextNode) {
             $prevNodes = $this->contentRepositoryRegistry->subgraphForNode($contextNode)
                 ->findPrecedingSiblingNodes(
-                    $contextNode->nodeAggregateId,
+                    $contextNode->aggregateId,
                     FindPrecedingSiblingNodesFilter::create()
                 )->reverse();
             foreach ($prevNodes as $prevNode) {

diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevOperation.php
@@ -67,10 +67,11 @@ public function evaluate(FlowQuery $flowQuery, array $arguments): void
     {
         $output = [];
         $outputNodePaths = [];
+        /** @var Node $contextNode */
         foreach ($flowQuery->getContext() as $contextNode) {
             $previousNode = $this->contentRepositoryRegistry->subgraphForNode($contextNode)
                 ->findPrecedingSiblingNodes(
-                    $contextNode->nodeAggregateId,
+                    $contextNode->aggregateId,
                     FindPrecedingSiblingNodesFilter::create()
                 )->first();
             if ($previousNode !== null && !isset($outputNodePaths[$previousNode->aggregateId->value])) {

diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevUntilOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevUntilOperation.php
@@ -71,10 +71,11 @@ public function evaluate(FlowQuery $flowQuery, array $arguments): void
         $output = [];
         $outputNodeIdentifiers = [];
 
+        /** @var Node $contextNode */
         foreach ($flowQuery->getContext() as $contextNode) {
             $prevNodes = $this->contentRepositoryRegistry->subgraphForNode($contextNode)
                 ->findPrecedingSiblingNodes(
-                    $contextNode->nodeAggregateId,
+                    $contextNode->aggregateId,
                     FindPrecedingSiblingNodesFilter::create()
                 );
             if (isset($arguments[0]) && !empty($arguments[0])) {

diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/SiblingsOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/SiblingsOperation.php
@@ -72,6 +72,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments): void
         }
 
         foreach ($flowQuery->getContext() as $contextNode) {
+            /** @var Node $contextNode */
             $subgraph = $this->contentRepositoryRegistry->subgraphForNode($contextNode);
 
             $parentNode = $subgraph->findParentNode($contextNode->aggregateId);