TASK: Catch error because of invalid template option

Author: mhsdesign

Classes/Domain/Template/RootTemplate.php

@@ -3,8 +3,6 @@
 
 namespace Flowpack\NodeTemplates\Domain\Template;
 
-use Flowpack\NodeTemplates\Domain\Template\Template;
-use Flowpack\NodeTemplates\Domain\Template\Templates;
 use Neos\Flow\Annotations as Flow;
 
 /**
@@ -31,6 +29,11 @@ public function __construct(array $properties, Templates $childNodes)
         $this->childNodes = $childNodes;
     }
 
+    public static function empty(): self
+    {
+        return new RootTemplate([], Templates::empty());
+    }
+
     /**
      * @return array<string, string>
      */

Classes/Domain/Template/Template.php

@@ -3,9 +3,8 @@
 
 namespace Flowpack\NodeTemplates\Domain\Template;
 
-use Flowpack\NodeTemplates\Domain\Template\Templates;
-use Neos\ContentRepository\Domain\NodeType\NodeTypeName;
 use Neos\ContentRepository\Domain\NodeAggregate\NodeName;
+use Neos\ContentRepository\Domain\NodeType\NodeTypeName;
 use Neos\Flow\Annotations as Flow;
 
 /** @Flow\Proxy(false) */

Classes/Domain/Template/Templates.php

@@ -2,8 +2,6 @@
 
 namespace Flowpack\NodeTemplates\Domain\Template;
 
-use Flowpack\NodeTemplates\Domain\Template\RootTemplate;
-use Flowpack\NodeTemplates\Domain\Template\Template;
 use Neos\Flow\Annotations as Flow;
 
 /** @Flow\Proxy(false) */
@@ -52,7 +50,7 @@ public function toRootTemplate(): RootTemplate
                 $first->getChildNodes()
             );
         }
-        return new RootTemplate( [], Templates::empty());
+        return RootTemplate::empty();
     }
 
     public function jsonSerialize()

Classes/Domain/TemplateConfiguration/TemplateConfigurationProcessor.php

@@ -7,7 +7,6 @@
 use Flowpack\NodeTemplates\Domain\Template\RootTemplate;
 use Flowpack\NodeTemplates\Domain\Template\Template;
 use Flowpack\NodeTemplates\Domain\Template\Templates;
-use Flowpack\NodeTemplates\Domain\TemplateConfiguration\EelEvaluationService;
 use Neos\ContentRepository\Domain\NodeAggregate\NodeName;
 use Neos\ContentRepository\Domain\NodeType\NodeTypeName;
 use Neos\Flow\Annotations as Flow;
@@ -31,12 +30,16 @@ class TemplateConfigurationProcessor
      */
     public function processTemplateConfiguration(array $configuration, array $evaluationContext, CaughtExceptions $caughtEvaluationExceptions): RootTemplate
     {
-        $templatePart = TemplatePart::createRoot(
-            $configuration,
-            $evaluationContext,
-            fn ($value, $evaluationContext) => $this->preprocessConfigurationValue($value, $evaluationContext),
-            $caughtEvaluationExceptions
-        );
+        try {
+            $templatePart = TemplatePart::createRoot(
+                $configuration,
+                $evaluationContext,
+                fn ($value, $evaluationContext) => $this->preprocessConfigurationValue($value, $evaluationContext),
+                $caughtEvaluationExceptions
+            );
+        } catch (StopBuildingTemplatePartException $e) {
+            return RootTemplate::empty();
+        }
         return $this->createTemplatesFromTemplatePart($templatePart)->toRootTemplate();
     }
 
@@ -105,7 +108,11 @@ private function createTemplateFromTemplatePart(TemplatePart $templatePart): Tem
         // process the childNodes
         $childNodeTemplates = Templates::empty();
         foreach ($templatePart->getRawConfiguration('childNodes') ?? [] as $childNodeConfigurationPath => $_) {
-            $childNodeTemplatePart = $templatePart->withConfigurationByConfigurationPath(['childNodes', $childNodeConfigurationPath]);
+            try {
+                $childNodeTemplatePart = $templatePart->withConfigurationByConfigurationPath(['childNodes', $childNodeConfigurationPath]);
+            } catch (StopBuildingTemplatePartException $e) {
+                continue;
+            }
             $childNodeTemplates = $childNodeTemplates->merge($this->createTemplatesFromTemplatePart($childNodeTemplatePart));
         }
 

Classes/Domain/TemplateConfiguration/TemplatePart.php

@@ -43,6 +43,7 @@ class TemplatePart
      * @psalm-param array<string, mixed> $configuration
      * @psalm-param array<string, mixed> $evaluationContext
      * @psalm-param \Closure(mixed $value, array<string, mixed> $evaluationContext): mixed $configurationValueProcessor
+     * @throws StopBuildingTemplatePartException
      */
     private function __construct(
         array $configuration,
@@ -63,6 +64,7 @@ private function __construct(
      * @psalm-param array<string, mixed> $configuration
      * @psalm-param array<string, mixed> $evaluationContext
      * @psalm-param \Closure(mixed $value, array<string, mixed> $evaluationContext): mixed $configurationValueProcessor
+     * @throws StopBuildingTemplatePartException
      */
     public static function createRoot(
         array $configuration,
@@ -91,6 +93,7 @@ public function getFullPathToConfiguration(): array
 
     /**
      * @psalm-param string|list<string> $configurationPath
+     * @throws StopBuildingTemplatePartException
      */
     public function withConfigurationByConfigurationPath($configurationPath): self
     {
@@ -188,16 +191,25 @@ public function hasConfiguration($configurationPath): bool
         return true;
     }
 
+    /**
+     * @throws StopBuildingTemplatePartException
+     */
     private function validateTemplateConfigurationKeys(): void
     {
         $isRootTemplate = $this->fullPathToConfiguration === [];
         foreach (array_keys($this->configuration) as $key) {
             if (!in_array($key, ['type', 'name', 'properties', 'childNodes', 'when', 'withItems', 'withContext'], true)) {
-                throw new \InvalidArgumentException(sprintf('Template configuration has illegal key "%s"', $key));
+                $this->caughtExceptions->add(
+                    CaughtException::fromException(new \InvalidArgumentException(sprintf('Template configuration has illegal key "%s"', $key), 1686150349274))
+                );
+                throw new StopBuildingTemplatePartException();
             }
             if ($isRootTemplate) {
                 if (!in_array($key, ['properties', 'childNodes', 'when', 'withContext'], true)) {
-                    throw new \InvalidArgumentException(sprintf('Root template configuration doesnt allow option "%s', $key));
+                    $this->caughtExceptions->add(
+                        CaughtException::fromException(new \InvalidArgumentException(sprintf('Root template configuration doesnt allow option "%s', $key), 1686150340657))
+                    );
+                    throw new StopBuildingTemplatePartException();
                 }
             }
         }

Configuration/Testing/NodeTypes.Malformed.yaml

@@ -43,6 +43,7 @@
         working: "working"
         nonDeclaredProperty: "hi"
         bar: "${'left open"
+        # only simple scalar types
         nonEelArrayNotAllowed:
           not: allowed
       childNodes:
@@ -90,3 +91,5 @@
         typeCantMutate:
           name: "type-cant-mutate"
           type: "Flowpack.NodeTemplates:Content.WithEvaluationExceptions"
+        invalidOption:
+          crazy: me

Tests/Functional/Fixtures/WithEvaluationExceptions.messages.json

@@ -47,6 +47,10 @@
         "message": "Configuration \"null\" in \"childNodes.withItemsAbortBecauseNotIterable.withItems\" | RuntimeException(Type NULL is not iterable., 1685802354186)",
         "severity": "ERROR"
     },
+    {
+        "message": "InvalidArgumentException(Template configuration has illegal key \"crazy\", 1686150349274)",
+        "severity": "ERROR"
+    },
     {
         "message": "Property \"_hidden\" in NodeType \"Flowpack.NodeTemplates:Content.WithEvaluationExceptions\" | PropertyIgnoredException(Because internal legacy property \"_hidden\" not implement., 1686149513158)",
         "severity": "ERROR"