Merge pull request neos#3969 from kitsunet/bugfix/avoid-type-error-wi…

…th-null-content BUGFIX: Fix NULL content type error in ContentElementWrappingService
markusguenther · Dec 1, 2022 · 3d2ddf4 · 3d2ddf4
2 parents c23a08f + 6b6cfd3
commit 3d2ddf4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Neos.Neos/Classes/Fusion/ContentElementWrappingImplementation.php b/Neos.Neos/Classes/Fusion/ContentElementWrappingImplementation.php
@@ -40,9 +40,9 @@ class ContentElementWrappingImplementation extends AbstractFusionObject
      *
      * @return string
      */
-    public function getValue()
+    public function getValue(): string
     {
-        return $this->fusionValue('value');
+        return (string)$this->fusionValue('value');
     }
 
     /**

diff --git a/Neos.Neos/Classes/Fusion/ExceptionHandlers/NodeWrappingHandler.php b/Neos.Neos/Classes/Fusion/ExceptionHandlers/NodeWrappingHandler.php
@@ -56,7 +56,7 @@ protected function handle($fusionPath, \Exception $exception, $referenceCode)
     {
         $handler = new ContextDependentHandler();
         $handler->setRuntime($this->runtime);
-        $output = $handler->handleRenderingException($fusionPath, $exception);
+        $output = (string)$handler->handleRenderingException($fusionPath, $exception);
 
         $currentContext = $this->getRuntime()->getCurrentContext();
         if (isset($currentContext['node'])) {

diff --git a/Neos.Neos/Classes/ViewHelpers/ContentElement/WrapViewHelper.php b/Neos.Neos/Classes/ViewHelpers/ContentElement/WrapViewHelper.php
@@ -78,6 +78,6 @@ public function render(): string
         $currentContext = $fusionObject->getRuntime()->getCurrentContext();
 
         $node = $this->arguments['node'] ?? $currentContext['node'];
-        return $this->contentElementWrappingService->wrapContentObject($node, $this->renderChildren(), $fusionObject->getPath());
+        return $this->contentElementWrappingService->wrapContentObject($node, (string)$this->renderChildren(), $fusionObject->getPath());
     }
 }