TASK: Adjust to changes in NodeType

Adjusts to changes to fix task neos/neos-development-collection#4515
neos · Sep 17, 2023 · 893446c · 893446c
1 parent 7a6c923
commit 893446c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 25 deletions.
diff --git a/Classes/Domain/Model/Changes/AbstractStructuralChange.php b/Classes/Domain/Model/Changes/AbstractStructuralChange.php
@@ -187,14 +187,17 @@ protected function findChildNodes(Node $node): Nodes
     protected function isNodeTypeAllowedAsChildNode(Node $node, NodeType $nodeType): bool
     {
         $subgraph = $this->contentRepositoryRegistry->subgraphForNode($node);
-        if (NodeInfoHelper::isAutoCreated($node, $subgraph)) {
-            $parentNode = $subgraph->findParentNode($node->nodeAggregateId);
-            return !$parentNode || $parentNode->nodeType->allowsGrandchildNodeType(
-                $node->nodeName->value,
-                $nodeType
-            );
-        } else {
+        $contentRepository = $this->contentRepositoryRegistry->get($node->subgraphIdentity->contentRepositoryId);
+        $nodeTypeManager = $contentRepository->getNodeTypeManager();
+        if (!$node->classification->isTethered()) {
             return $node->nodeType->allowsChildNodeType($nodeType);
         }
+
+        $parentNode = $subgraph->findParentNode($node->nodeAggregateId);
+        return !$parentNode || $nodeTypeManager->allowsGrandchildNodeType(
+                $parentNode->nodeType,
+                $node->nodeName,
+                $nodeType
+            );
     }
 }
diff --git a/Classes/Fusion/Helper/NodeInfoHelper.php b/Classes/Fusion/Helper/NodeInfoHelper.php
@@ -11,6 +11,7 @@
  * source code.
  */
 
+use Neos\ContentRepository\Core\NodeType\NodeTypeManager;
 use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\CountAncestorNodesFilter;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindChildNodesFilter;
@@ -53,12 +54,6 @@ class NodeInfoHelper implements ProtectedContextAwareInterface
      */
     protected $contentRepositoryRegistry;
 
-    /**
-     * @Flow\Inject
-     * @var EntityToIdentityConverter
-     */
-    protected $entityToIdentityConverter;
-
     /**
      * @Flow\Inject
      * @var PersistenceManagerInterface
@@ -236,7 +231,7 @@ protected function getBasicNodeInformation(Node $node): array
             'identifier' => $node->nodeAggregateId->jsonSerialize(),
             'nodeType' => $node->nodeType->getName(),
             'label' => $node->getLabel(),
-            'isAutoCreated' => self::isAutoCreated($node, $subgraph),
+            'isAutoCreated' => $node->classification->isTethered(),
             // TODO: depth is expensive to calculate; maybe let's get rid of this?
             'depth' => $subgraph->countAncestorNodes(
                 $node->nodeAggregateId,
@@ -251,17 +246,6 @@ protected function getBasicNodeInformation(Node $node): array
         ];
     }
 
-    public static function isAutoCreated(Node $node, ContentSubgraphInterface $subgraph): bool
-    {
-        $parent = $subgraph->findParentNode($node->nodeAggregateId);
-        if ($parent) {
-            if (array_key_exists($node->nodeName->value, $parent->nodeType->getAutoCreatedChildNodes())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     /**
      * Get information for all children of the given parent node.
      *