Merge pull request #69 from queoGmbH/task/adjustToRenamedNodeType

TASK: Adjust to renamed NodeTypeConstraints
sitegeist · Nov 3, 2023 · da9ba82 · da9ba82
2 parents 757ba63 + 1daf464
commit da9ba82
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/Classes/FlowQuery/ReferencedTaxonomiesOperation.php b/Classes/FlowQuery/ReferencedTaxonomiesOperation.php
@@ -6,8 +6,8 @@
 
 use Neos\ContentRepository\Core\NodeType\NodeTypeNames;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindReferencesFilter;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\NodeType\NodeTypeCriteria;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
-use Neos\ContentRepository\Core\Projection\ContentGraph\NodeTypeConstraints;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Eel\FlowQuery\FlowQuery;
 use Neos\Eel\FlowQuery\Operations\AbstractOperation;
@@ -57,7 +57,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
     {
         $nodes = [];
         $findReferencesFilter = FindReferencesFilter::create(
-            nodeTypeConstraints: NodeTypeConstraints::create(
+            nodeTypes: NodeTypeCriteria::create(
                 NodeTypeNames::fromArray([$this->taxonomyService->getTaxonomyNodeTypeName()]),
                 NodeTypeNames::createEmpty()
             ),

diff --git a/Classes/FlowQuery/ReferencingTaxonomiesOperation.php b/Classes/FlowQuery/ReferencingTaxonomiesOperation.php
@@ -5,8 +5,8 @@
 namespace Sitegeist\Taxonomy\FlowQuery;
 
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindBackReferencesFilter;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\NodeType\NodeTypeCriteria;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
-use Neos\ContentRepository\Core\Projection\ContentGraph\NodeTypeConstraints;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Eel\FlowQuery\FlowQuery;
 use Neos\Eel\FlowQuery\Operations\AbstractOperation;
@@ -52,7 +52,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
     {
         $nodes = [];
         $findBackReferencesFilter = FindBackReferencesFilter::create(
-            nodeTypeConstraints: NodeTypeConstraints::fromFilterString('Neos.Neos:Document'),
+            nodeTypes: NodeTypeCriteria::fromFilterString('Neos.Neos:Document'),
             referenceName: 'taxonomyReferences'
         );
 

diff --git a/Classes/FlowQuery/SubTaxonomiesOperation.php b/Classes/FlowQuery/SubTaxonomiesOperation.php
@@ -4,12 +4,11 @@
 
 namespace Sitegeist\Taxonomy\FlowQuery;
 
-use Neos\ContentRepository\Core\NodeType\NodeTypeName;
 use Neos\ContentRepository\Core\NodeType\NodeTypeNames;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindSubtreeFilter;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\NodeType\NodeTypeCriteria;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes;
-use Neos\ContentRepository\Core\Projection\ContentGraph\NodeTypeConstraints;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Eel\FlowQuery\FlowQuery;
 use Neos\Eel\FlowQuery\Operations\AbstractOperation;
@@ -60,7 +59,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
         $nodes = Nodes::createEmpty();
 
         $filter = FindSubtreeFilter::create(
-            NodeTypeConstraints::create(
+            NodeTypeCriteria::create(
                 NodeTypeNames::fromArray([$this->taxonomyService->getTaxonomyNodeTypeName()]),
                 NodeTypeNames::createEmpty()
             )

diff --git a/Classes/FlowQuery/WithSubTaxonomiesOperation.php b/Classes/FlowQuery/WithSubTaxonomiesOperation.php
@@ -4,12 +4,11 @@
 
 namespace Sitegeist\Taxonomy\FlowQuery;
 
-use Neos\ContentRepository\Core\NodeType\NodeTypeName;
 use Neos\ContentRepository\Core\NodeType\NodeTypeNames;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindSubtreeFilter;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\NodeType\NodeTypeCriteria;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes;
-use Neos\ContentRepository\Core\Projection\ContentGraph\NodeTypeConstraints;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Eel\FlowQuery\FlowQuery;
 use Neos\Eel\FlowQuery\Operations\AbstractOperation;
@@ -62,7 +61,7 @@ public function canEvaluate($context)
     public function evaluate(FlowQuery $flowQuery, array $arguments)
     {
         $filter = FindSubtreeFilter::create(
-            NodeTypeConstraints::create(
+            nodeTypes: NodeTypeCriteria::create(
                 NodeTypeNames::fromArray([$this->taxonomyService->getTaxonomyNodeTypeName()]),
                 NodeTypeNames::createEmpty()
             )

diff --git a/Classes/Service/TaxonomyService.php b/Classes/Service/TaxonomyService.php
@@ -24,10 +24,10 @@
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindAncestorNodesFilter;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindChildNodesFilter;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindSubtreeFilter;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\NodeType\NodeTypeCriteria;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\Projection\ContentGraph\NodePath;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes;
-use Neos\ContentRepository\Core\Projection\ContentGraph\NodeTypeConstraints;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Subtree;
 use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
 use Neos\ContentRepository\Core\Projection\Workspace\Workspace;
@@ -84,7 +84,7 @@ public function findVocabularyForNode(Node $node): Node
         $ancestors = $subgraph->findAncestorNodes(
             $node->nodeAggregateId,
             FindAncestorNodesFilter::create(
-                NodeTypeConstraints::create(
+                nodeTypes: NodeTypeCriteria::create(
                     NodeTypeNames::fromArray([ $this->getVocabularyNodeTypeName()]),
                     NodeTypeNames::createEmpty()
                 )
@@ -131,7 +131,7 @@ public function findAllVocabularies(ContentSubgraphInterface $subgraph): Nodes
         return $subgraph->findChildNodes(
             $root->nodeAggregateId,
             FindChildNodesFilter::create(
-                NodeTypeConstraints::create(
+                nodeTypes: NodeTypeCriteria::create(
                     NodeTypeNames::fromArray([$this->getVocabularyNodeTypeName()]),
                     NodeTypeNames::createEmpty()
                 )
@@ -171,7 +171,7 @@ public function findSubtree(Node $StartNode): ?Subtree
         $vocabularySubtree = $subgraph->findSubtree(
             $StartNode->nodeAggregateId,
             FindSubtreeFilter::create(
-                NodeTypeConstraints::create(
+                nodeTypes: NodeTypeCriteria::create(
                     NodeTypeNames::fromArray([$this->getTaxonomyNodeTypeName(), $this->getVocabularyNodeTypeName()]),
                     NodeTypeNames::createEmpty()
                 )