FEATURE: Neos 9.0 compatibility

Classes/Application/Command/NodeTemplateCommandController.php

@@ -8,8 +8,6 @@
 use Flowpack\NodeTemplates\Domain\NodeCreation\NodeCreationService;
 use Flowpack\NodeTemplates\Domain\NodeTemplateDumper\NodeTemplateDumper;
 use Flowpack\NodeTemplates\Domain\TemplateConfiguration\TemplateConfigurationProcessor;
-use Neos\ContentRepository\Domain\Service\ContextFactoryInterface;
-use Neos\ContentRepository\Domain\Service\NodeTypeManager;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Cli\CommandController;
 
@@ -21,12 +19,6 @@ class NodeTemplateCommandController extends CommandController
      */
     protected $nodeCreationService;
 
-    /**
-     * @Flow\Inject
-     * @var ContextFactoryInterface
-     */
-    protected $contextFactory;
-
     /**
      * @Flow\Inject
      * @var NodeTemplateDumper
@@ -39,11 +31,6 @@ class NodeTemplateCommandController extends CommandController
      */
     protected $templateConfigurationProcessor;
 
-    /**
-     * @Flow\Inject
-     * @var NodeTypeManager
-     */
-    protected $nodeTypeManager;
 
     /**
      * Dump the node tree structure into a NodeTemplate YAML structure.
@@ -55,6 +42,8 @@ class NodeTemplateCommandController extends CommandController
      */
     public function createFromNodeSubtreeCommand(string $startingNodeId, string $workspaceName = 'live'): void
     {
+        // TODO re-enable
+        throw new \BadMethodCallException('Not implemented.');
         $subgraph = $this->contextFactory->create([
             'workspaceName' => $workspaceName
         ]);
@@ -74,6 +63,8 @@ public function createFromNodeSubtreeCommand(string $startingNodeId, string $wor
      */
     public function validateCommand(): void
     {
+        // TODO re-enable
+        throw new \BadMethodCallException('Not implemented.');
         $templatesChecked = 0;
         /**
          * nodeTypeNames as index

Classes/Domain/DelegatingDocumentTitleNodeCreationHandler.php

@@ -3,9 +3,10 @@
 
 namespace Flowpack\NodeTemplates\Domain;
 
-use Neos\ContentRepository\Domain\Model\NodeInterface;
+use Neos\ContentRepository\Core\ContentRepository;
 use Neos\Flow\Annotations as Flow;
 use Neos\Neos\Ui\NodeCreationHandler\DocumentTitleNodeCreationHandler;
+use Neos\Neos\Ui\NodeCreationHandler\NodeCreationCommands;
 use Neos\Neos\Ui\NodeCreationHandler\NodeCreationHandlerInterface;
 
 /**
@@ -23,21 +24,22 @@ class DelegatingDocumentTitleNodeCreationHandler implements NodeCreationHandlerI
      */
     protected $originalDocumentTitleNodeCreationHandler;
 
-    /**
-     * @throws \Neos\Eel\Exception
-     * @throws \Neos\Neos\Exception
-     */
-    public function handle(NodeInterface $node, array $data): void
-    {
-        $template = $node->getNodeType()->getOptions()['template'] ?? null;
+    public function handle(
+        NodeCreationCommands $commands,
+        array $data,
+        ContentRepository $contentRepository
+    ): NodeCreationCommands {
+        $nodeType = $contentRepository->getNodeTypeManager()
+            ->getNodeType($commands->first->nodeTypeName);
+        $template = $nodeType->getOptions()['template'] ?? null;
         if (
             !$template
             || !isset($template['properties']['uriPathSegment'])
         ) {
-            $this->originalDocumentTitleNodeCreationHandler->handle($node, $data);
-            return;
+            return $this->originalDocumentTitleNodeCreationHandler->handle($commands, $data, $contentRepository);
         }
 
         // do nothing, as we handle this already when applying the template
+        return $commands;
     }
 }

Classes/Domain/ExceptionHandling/ExceptionHandler.php

@@ -2,7 +2,8 @@
 
 namespace Flowpack\NodeTemplates\Domain\ExceptionHandling;
 
-use Neos\ContentRepository\Domain\Model\NodeInterface;
+use Neos\ContentRepository\Core\NodeType\NodeType;
+use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Log\ThrowableStorageInterface;
 use Neos\Flow\Log\Utility\LogEnvironment;
@@ -36,7 +37,7 @@ class ExceptionHandler
      */
     protected $configuration;
 
-    public function handleAfterTemplateConfigurationProcessing(CaughtExceptions $caughtExceptions, NodeInterface $node): void
+    public function handleAfterTemplateConfigurationProcessing(CaughtExceptions $caughtExceptions, NodeType $nodeType, NodeAggregateId $nodeAggregateId): void
     {
         if (!$caughtExceptions->hasExceptions()) {
             return;
@@ -47,7 +48,7 @@ public function handleAfterTemplateConfigurationProcessing(CaughtExceptions $cau
         }
 
         $templateNotCreatedException = new TemplateNotCreatedException(
-            sprintf('Template for "%s" was not applied. Only %s was created.', $node->getNodeType()->getLabel(), (string)$node),
+            sprintf('Template for "%s" was not applied. Only %s was created.', $nodeType->getLabel(), $nodeAggregateId->value),
             1686135532992,
             $caughtExceptions->first()->getException(),
         );
@@ -57,14 +58,14 @@ public function handleAfterTemplateConfigurationProcessing(CaughtExceptions $cau
         throw $templateNotCreatedException;
     }
 
-    public function handleAfterNodeCreation(CaughtExceptions $caughtExceptions, NodeInterface $node): void
+    public function handleAfterNodeCreation(CaughtExceptions $caughtExceptions, NodeType $nodeType, NodeAggregateId $nodeAggregateId): void
     {
         if (!$caughtExceptions->hasExceptions()) {
             return;
         }
 
         $templatePartiallyCreatedException = new TemplatePartiallyCreatedException(
-            sprintf('Template for "%s" only partially applied. Please check the newly created nodes beneath %s.', $node->getNodeType()->getLabel(), (string)$node),
+            sprintf('Template for "%s" only partially applied. Please check the newly created nodes beneath %s.', $nodeType->getLabel(), $nodeAggregateId->value),
             1686135564160,
             $caughtExceptions->first()->getException(),
         );