fix: post processing json encoding (#159)

ems-project · Dec 6, 2022 · 8f3da89 · 8f3da89
1 parent 0f91c2a
commit 8f3da89
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/EMS/core-bundle/src/Service/Revision/PostProcessingService.php b/EMS/core-bundle/src/Service/Revision/PostProcessingService.php
@@ -17,6 +17,7 @@
 use EMS\CoreBundle\Form\DataField\JsonMenuNestedEditorFieldType;
 use EMS\CoreBundle\Form\DataField\MultiplexedTabContainerFieldType;
 use EMS\CoreBundle\Form\Form\RevisionJsonMenuNestedType;
+use EMS\Helpers\Standard\Json;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormFactoryInterface;
@@ -137,10 +138,15 @@ public function postProcessing(FormInterface $form, ContentType $contentType, ar
                 try {
                     $out = $this->twig->createTemplate($template)->render($context);
 
-                    if ($fieldType->getDisplayOptions()['json'] && '' !== $out) {
+                    if (!$fieldType->getDisplayOptions()['json']) {
+                        $out = \trim($out);
+                    } elseif (Json::isJson($out)) {
                         $out = \json_decode($out, true, 512, JSON_THROW_ON_ERROR);
                     } else {
-                        $out = \trim($out);
+                        if (0 !== \strlen(\trim($out))) {
+                            throw new \RuntimeException(\sprintf('None parsable output in "%s"', $path));
+                        }
+                        $out = null;
                     }
                 } catch (\Throwable $e) {
                     if ($e->getPrevious() && $e->getPrevious() instanceof CantBeFinalizedException) {