From 207358f0a0ceb35dfa294a98dd4f82d92bad15d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Wolda=C5=84ski?= <t.woldanski@macopedia.com>
Date: Thu, 11 Jul 2024 16:05:09 +0200
Subject: [PATCH] [FEATURE] Add `nullableFieldsIfEmpty` option to
 JsonContentObject

This new option adds ability to define which fields
should be set to null when parsed TypoScript returns empty string
---
 Classes/ContentObject/JsonContentObject.php        | 3 ++-
 Tests/Unit/ContentObject/JsonContentObjectTest.php | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Classes/ContentObject/JsonContentObject.php b/Classes/ContentObject/JsonContentObject.php
index 997b1aca..7a220e9d 100755
--- a/Classes/ContentObject/JsonContentObject.php
+++ b/Classes/ContentObject/JsonContentObject.php
@@ -97,6 +97,7 @@ public function render($conf = []): string
     public function cObjGet(array $setup, string $addKey = ''): array
     {
         $content = [];
+        $nullableFieldsOnEmpty = GeneralUtility::trimExplode(',', $this->conf['nullableFieldsIfEmpty'] ?? '', true);
 
         $sKeyArray = $this->filterByStringKeys($setup);
         foreach ($sKeyArray as $theKey) {
@@ -117,7 +118,7 @@ public function cObjGet(array $setup, string $addKey = ''): array
                 if ($theValue === 'USER_INT' || str_starts_with((string)$content[$theKey], '<!--INT_SCRIPT.')) {
                     $content[$theKey] = $this->headlessUserInt->wrap($content[$theKey], (int)($conf['ifEmptyReturnNull'] ?? 0) === 1 ? HeadlessUserInt::STANDARD_NULLABLE : HeadlessUserInt::STANDARD);
                 }
-                if ((int)($conf['ifEmptyReturnNull'] ?? 0) === 1 && $content[$theKey] === '') {
+                if ($content[$theKey] === '' && ((int)($conf['ifEmptyReturnNull'] ?? 0) === 1 || in_array($theKey, $nullableFieldsOnEmpty, true))) {
                     $content[$theKey] = null;
                 }
                 if ((int)($conf['ifEmptyUnsetKey'] ?? 0) === 1 && ($content[$theKey] === '' || $content[$theKey] === false)) {
diff --git a/Tests/Unit/ContentObject/JsonContentObjectTest.php b/Tests/Unit/ContentObject/JsonContentObjectTest.php
index 1160cc83..0a3d2944 100644
--- a/Tests/Unit/ContentObject/JsonContentObjectTest.php
+++ b/Tests/Unit/ContentObject/JsonContentObjectTest.php
@@ -148,6 +148,7 @@ public function dataProvider(): array
             [[], '[]'],
             [null, '[]'],
             [['fields.' => ['test' => 'TEXT', 'test.' => ['value' => '', 'ifEmptyUnsetKey' => 1]]], json_encode([])],
+            [['nullableFieldsIfEmpty' => 'test,test3', 'fields.' => ['test' => 'TEXT', 'test.' => ['value' => ''], 'test2' => 'TEXT', 'test2.' => ['value' => '1'],'test3' => 'TEXT', 'test3.' => ['value' => '']]], json_encode(['test' => null, 'test2' => '1', 'test3' => null])],
             [['fields.' => ['test' => 'INT', 'test.' => ['value' => '1', 'ifEmptyUnsetKey' => 1]]], json_encode(['test' => 1])],
             [['if.' => ['isTrue' => 0], 'fields.' => ['test' => 'TEXT', 'test.' => ['value' => '1']]], ''],
             [['if.' => ['isTrue' => 1], 'fields.' => ['test' => 'TEXT', 'test.' => ['value' => '1']]], json_encode(['test' => '1'])],