TASK: Improve DI for TemplateNodeCreationHandler and early return i…

…f `$$nodeType` does not exist like in v2
Flowpack · Jun 22, 2024 · f35a583 · f35a583
1 parent 3f0bad4
commit f35a583
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 28 deletions.
diff --git a/Classes/Domain/TemplateNodeCreationHandler.php b/Classes/Domain/TemplateNodeCreationHandler.php
@@ -9,34 +9,19 @@
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindClosestNodeFilter;
 use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
-use Neos\Flow\Annotations as Flow;
 use Neos\Neos\Domain\Service\NodeTypeNameFactory;
 use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationCommands;
 use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationElements;
 use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationHandlerInterface;
 
-class TemplateNodeCreationHandler implements NodeCreationHandlerInterface
+final readonly class TemplateNodeCreationHandler implements NodeCreationHandlerInterface
 {
-    /**
-     * @var NodeCreationService
-     * @Flow\Inject
-     */
-    protected $nodeCreationService;
-
-    /**
-     * @var TemplateConfigurationProcessor
-     * @Flow\Inject
-     */
-    protected $templateConfigurationProcessor;
-
-    /**
-     * @var ProcessingErrorHandler
-     * @Flow\Inject
-     */
-    protected $processingErrorHandler;
-
-    public function __construct(private readonly ContentRepository $contentRepository)
-    {
+    public function __construct(
+        private ContentRepository $contentRepository,
+        private NodeCreationService $nodeCreationService,
+        private TemplateConfigurationProcessor $templateConfigurationProcessor,
+        private ProcessingErrorHandler $processingErrorHandler
+    ) {
     }
 
     /**
@@ -49,11 +34,7 @@ public function handle(
         $nodeType = $this->contentRepository->getNodeTypeManager()
             ->getNodeType($commands->first->nodeTypeName);
 
-        if (!$nodeType) {
-            throw new \RuntimeException(sprintf('Initial NodeType "%s" does not exist anymore.', $commands->first->nodeTypeName->value), 1718950358);
-        }
-
-        $templateConfiguration = $nodeType->getOptions()['template'] ?? null;
+        $templateConfiguration = $nodeType?->getOptions()['template'] ?? null;
         if (!$templateConfiguration) {
             return $commands;
         }

diff --git a/Classes/Domain/TemplateNodeCreationHandlerFactory.php b/Classes/Domain/TemplateNodeCreationHandlerFactory.php
@@ -2,14 +2,32 @@
 
 namespace Flowpack\NodeTemplates\Domain;
 
+use Flowpack\NodeTemplates\Domain\ErrorHandling\ProcessingErrorHandler;
+use Flowpack\NodeTemplates\Domain\NodeCreation\NodeCreationService;
+use Flowpack\NodeTemplates\Domain\TemplateConfiguration\TemplateConfigurationProcessor;
 use Neos\ContentRepository\Core\ContentRepository;
+use Neos\Flow\Annotations as Flow;
 use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationHandlerFactoryInterface;
 use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationHandlerInterface;
 
 final class TemplateNodeCreationHandlerFactory implements NodeCreationHandlerFactoryInterface
 {
+    #[Flow\Inject]
+    protected NodeCreationService $nodeCreationService;
+
+    #[Flow\Inject]
+    protected TemplateConfigurationProcessor $templateConfigurationProcessor;
+
+    #[Flow\Inject]
+    protected ProcessingErrorHandler $processingErrorHandler;
+
     public function build(ContentRepository $contentRepository): NodeCreationHandlerInterface
     {
-        return new TemplateNodeCreationHandler($contentRepository);
+        return new TemplateNodeCreationHandler(
+            $contentRepository,
+            $this->nodeCreationService,
+            $this->templateConfigurationProcessor,
+            $this->processingErrorHandler
+        );
     }
 }