Merge pull request neos#3625 from neos/task/4522-renameNodeTypeConstr…

…aints TASK: Adjust to renamed `NodeTypeConstraints`
queoGmbH · Nov 3, 2023 · 4bd6825 · 4bd6825
2 parents 5306eea + 8c1b108
commit 4bd6825
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/Classes/ContentRepository/Service/WorkspaceService.php b/Classes/ContentRepository/Service/WorkspaceService.php
@@ -98,7 +98,7 @@ public function getPublishableNodeInfo(WorkspaceName $workspaceName, ContentRepo
                 $node = $subgraph->findNodeById($change->nodeAggregateId);
 
                 if ($node instanceof Node) {
-                    $documentNode = $subgraph->findClosestNode($node->nodeAggregateId, FindClosestNodeFilter::create(nodeTypeConstraints: NodeTypeNameFactory::NAME_DOCUMENT));
+                    $documentNode = $subgraph->findClosestNode($node->nodeAggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
                     if ($documentNode instanceof Node) {
                         $contentRepository = $this->contentRepositoryRegistry->get($documentNode->subgraphIdentity->contentRepositoryId);
                         $nodeAddressFactory = NodeAddressFactory::create($contentRepository);

diff --git a/Classes/Domain/Model/AbstractChange.php b/Classes/Domain/Model/AbstractChange.php
@@ -67,7 +67,7 @@ protected function updateWorkspaceInfo(): void
     {
         if (!is_null($this->subject)) {
             $subgraph = $this->contentRepositoryRegistry->subgraphForNode($this->subject);
-            $documentNode = $subgraph->findClosestNode($this->subject->nodeAggregateId, FindClosestNodeFilter::create(nodeTypeConstraints: NodeTypeNameFactory::NAME_DOCUMENT));
+            $documentNode = $subgraph->findClosestNode($this->subject->nodeAggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
             if (!is_null($documentNode)) {
                 $contentRepository = $this->contentRepositoryRegistry->get($this->subject->subgraphIdentity->contentRepositoryId);
                 $workspace = $contentRepository->getWorkspaceFinder()->findOneByCurrentContentStreamId(

diff --git a/Classes/Domain/Model/Changes/Remove.php b/Classes/Domain/Model/Changes/Remove.php
@@ -70,7 +70,7 @@ public function apply(): void
             $this->updateWorkspaceInfo();
 
             $subgraph = $this->contentRepositoryRegistry->subgraphForNode($this->subject);
-            $closestDocumentParentNode = $subgraph->findClosestNode($this->subject->nodeAggregateId, FindClosestNodeFilter::create(nodeTypeConstraints: NodeTypeNameFactory::NAME_DOCUMENT));
+            $closestDocumentParentNode = $subgraph->findClosestNode($this->subject->nodeAggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
             $command = RemoveNodeAggregate::create(
                 $subject->subgraphIdentity->contentStreamId,
                 $subject->nodeAggregateId,

diff --git a/Classes/Domain/Model/Feedback/Operations/ReloadDocument.php b/Classes/Domain/Model/Feedback/Operations/ReloadDocument.php
@@ -73,7 +73,7 @@ public function serializePayload(ControllerContext $controllerContext): array
         $nodeInfoHelper = new NodeInfoHelper();
 
         $documentNode = $this->contentRepositoryRegistry->subgraphForNode($this->node)
-            ->findClosestNode($this->node->nodeAggregateId, FindClosestNodeFilter::create(nodeTypeConstraints: NodeTypeNameFactory::NAME_DOCUMENT));
+            ->findClosestNode($this->node->nodeAggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
 
         if ($documentNode) {
             return [

diff --git a/Classes/FlowQueryOperations/NeosUiDefaultNodesOperation.php b/Classes/FlowQueryOperations/NeosUiDefaultNodesOperation.php
@@ -15,7 +15,7 @@
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindAncestorNodesFilter;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindChildNodesFilter;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
-use Neos\ContentRepository\Core\Projection\ContentGraph\NodeTypeConstraints;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\NodeType\NodeTypeCriteria;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Eel\FlowQuery\FlowQuery;
 use Neos\Eel\FlowQuery\Operations\AbstractOperation;
@@ -75,14 +75,14 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
         $contentRepository = $this->contentRepositoryRegistry->get($documentNode->subgraphIdentity->contentRepositoryId);
         $nodeAddressFactory = NodeAddressFactory::create($contentRepository);
 
-        $baseNodeTypeConstraints = NodeTypeConstraints::fromFilterString($baseNodeType);
+        $baseNodeTypeConstraints = NodeTypeCriteria::fromFilterString($baseNodeType);
 
         $subgraph = $this->contentRepositoryRegistry->subgraphForNode($documentNode);
 
         $ancestors = $subgraph->findAncestorNodes(
             $documentNode->nodeAggregateId,
             FindAncestorNodesFilter::create(
-                NodeTypeConstraints::fromFilterString('Neos.Neos:Document')
+                NodeTypeCriteria::fromFilterString('Neos.Neos:Document')
             )
         );
 
@@ -117,7 +117,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
             ) {
                 foreach ($subgraph->findChildNodes(
                     $baseNode->nodeAggregateId,
-                    FindChildNodesFilter::create(nodeTypeConstraints: $baseNodeTypeConstraints)
+                    FindChildNodesFilter::create(nodeTypes: $baseNodeTypeConstraints)
                 ) as $childNode) {
                     $nodes[$childNode->nodeAggregateId->value] = $childNode;
                     $gatherNodesRecursively($nodes, $childNode, $level + 1);

diff --git a/Classes/FlowQueryOperations/NeosUiFilteredChildrenOperation.php b/Classes/FlowQueryOperations/NeosUiFilteredChildrenOperation.php
@@ -14,7 +14,7 @@
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindChildNodesFilter;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\NodeType\NodeTypeConstraintParser;
-use Neos\ContentRepository\Core\Projection\ContentGraph\NodeTypeConstraints;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\NodeType\NodeTypeCriteria;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Eel\FlowQuery\FlowQuery;
 use Neos\Eel\FlowQuery\Operations\AbstractOperation;
@@ -76,7 +76,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
 
             foreach ($subgraph->findChildNodes(
                 $contextNode->nodeAggregateId,
-                FindChildNodesFilter::create(nodeTypeConstraints: $arguments[0] ?? null)
+                FindChildNodesFilter::create(nodeTypes: $arguments[0] ?? null)
             ) as $childNode) {
                 if (!isset($outputNodeIdentifiers[$childNode->nodeAggregateId->value])) {
                     $output[] = $childNode;

diff --git a/Classes/FlowQueryOperations/SearchOperation.php b/Classes/FlowQueryOperations/SearchOperation.php
@@ -15,7 +15,7 @@
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\Projection\ContentGraph\SearchTerm;
 use Neos\ContentRepository\Core\NodeType\NodeTypeConstraintParser;
-use Neos\ContentRepository\Core\Projection\ContentGraph\NodeTypeConstraints;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\NodeType\NodeTypeCriteria;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIds;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Eel\FlowQuery\FlowQuery;
@@ -80,7 +80,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments): void
             $filter = $filter->with(searchTerm: $arguments[0]);
         }
         if (isset($arguments[1]) && $arguments[1] !== '') {
-            $filter = $filter->with(nodeTypeConstraints: $arguments[1]);
+            $filter = $filter->with(nodeTypes: $arguments[1]);
         }
         $nodes = $subgraph->findDescendantNodes(
             $contextNode->nodeAggregateId,

diff --git a/Classes/Fusion/Helper/NodeInfoHelper.php b/Classes/Fusion/Helper/NodeInfoHelper.php
@@ -245,13 +245,13 @@ protected function renderChildrenInformation(Node $node, string $nodeTypeFilterS
 
         $documentChildNodes = $subgraph->findChildNodes(
             $node->nodeAggregateId,
-            FindChildNodesFilter::create(nodeTypeConstraints: $nodeTypeFilterString)
+            FindChildNodesFilter::create(nodeTypes: $nodeTypeFilterString)
         );
         // child nodes for content tree, must not include those nodes filtered out by `baseNodeType`
         $contentChildNodes = $subgraph->findChildNodes(
             $node->nodeAggregateId,
             FindChildNodesFilter::create(
-                nodeTypeConstraints: $this->buildContentChildNodeFilterString()
+                nodeTypes: $this->buildContentChildNodeFilterString()
             )
         );
         $childNodes = $documentChildNodes->merge($contentChildNodes);
@@ -480,7 +480,7 @@ private function getChildNodes(Node $node, string $nodeTypeFilterString): Nodes
         return $this->contentRepositoryRegistry->subgraphForNode($node)
             ->findChildNodes(
                 $node->nodeAggregateId,
-                FindChildNodesFilter::create(nodeTypeConstraints: $nodeTypeFilterString)
+                FindChildNodesFilter::create(nodeTypes: $nodeTypeFilterString)
             );
     }