From 597b2ce1cbb852d02b94a0b5a27da03366dc5821 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anke=20H=C3=A4slich?= <anke@neos.io>
Date: Mon, 16 Oct 2023 22:28:11 +0200
Subject: [PATCH] TASK: Fix merge error and remove outdated use statements

---
 Classes/Domain/Model/Changes/AbstractStructuralChange.php | 8 ++++----
 Classes/Fusion/Helper/NodeInfoHelper.php                  | 8 --------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/Classes/Domain/Model/Changes/AbstractStructuralChange.php b/Classes/Domain/Model/Changes/AbstractStructuralChange.php
index da4be77231..127c08005f 100644
--- a/Classes/Domain/Model/Changes/AbstractStructuralChange.php
+++ b/Classes/Domain/Model/Changes/AbstractStructuralChange.php
@@ -195,9 +195,9 @@ protected function isNodeTypeAllowedAsChildNode(Node $node, NodeType $nodeType):
         $nodeTypeManager = $this->contentRepositoryRegistry->get($node->subgraphIdentity->contentRepositoryId)->getNodeTypeManager();
 
         return !$parentNode || $nodeTypeManager->isNodeTypeAllowedAsChildToTetheredNode(
-                $this->getNodeType($parentNode),
-                $node->nodeName,
-                $nodeType
-            );
+            $this->getNodeType($parentNode),
+            $node->nodeName,
+            $nodeType
+        );
     }
 }
diff --git a/Classes/Fusion/Helper/NodeInfoHelper.php b/Classes/Fusion/Helper/NodeInfoHelper.php
index 2c8eb99820..6de4667f91 100644
--- a/Classes/Fusion/Helper/NodeInfoHelper.php
+++ b/Classes/Fusion/Helper/NodeInfoHelper.php
@@ -11,8 +11,6 @@
  * 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;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
@@ -55,12 +53,6 @@ class NodeInfoHelper implements ProtectedContextAwareInterface
      */
     protected $userLocaleService;
 
-    /**
-     * @Flow\Inject
-     * @var ContentRepositoryRegistry
-     */
-    protected $contentRepositoryRegistry;
-
     /**
      * @Flow\Inject
      * @var EntityToIdentityConverter