Merge pull request #3642 from neos/task/90-remove-nodetypemanager-fro…

…m-node-4515-squashed TASK: Adjust to changes in `NodeType`
neos · Oct 17, 2023 · edf303e · edf303e
2 parents 01dfa39 + a7aaa43
commit edf303e
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/Classes/Domain/Model/Changes/AbstractStructuralChange.php b/Classes/Domain/Model/Changes/AbstractStructuralChange.php
@@ -186,15 +186,18 @@ protected function findChildNodes(Node $node): Nodes
 
     protected function isNodeTypeAllowedAsChildNode(Node $node, NodeType $nodeType): bool
     {
-        $subgraph = $this->contentRepositoryRegistry->subgraphForNode($node);
-        if ($node->classification === NodeAggregateClassification::CLASSIFICATION_TETHERED) {
-            $parentNode = $subgraph->findParentNode($node->nodeAggregateId);
-            return !$parentNode || $this->getNodeType($parentNode)->allowsGrandchildNodeType(
-                $node->nodeName->value,
-                $nodeType
-            );
-        } else {
+        if ($node->classification !== NodeAggregateClassification::CLASSIFICATION_TETHERED) {
             return $this->getNodeType($node)->allowsChildNodeType($nodeType);
         }
+
+        $subgraph = $this->contentRepositoryRegistry->subgraphForNode($node);
+        $parentNode = $subgraph->findParentNode($node->nodeAggregateId);
+        $nodeTypeManager = $this->contentRepositoryRegistry->get($node->subgraphIdentity->contentRepositoryId)->getNodeTypeManager();
+
+        return !$parentNode || $nodeTypeManager->isNodeTypeAllowedAsChildToTetheredNode(
+            $this->getNodeType($parentNode),
+            $node->nodeName,
+            $nodeType
+        );
     }
 }