IBX-7935: Allowed BC

ibexa · May 10, 2024 · 9d790b3 · 9d790b3
1 parent 292ee47
commit 9d790b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/lib/Form/Type/Content/BaseContentType.php b/src/lib/Form/Type/Content/BaseContentType.php
@@ -72,17 +72,19 @@ public function configureOptions(OptionsResolver $resolver)
                 'translation_domain' => 'ibexa_content_forms_content',
                 'contentCreateStruct' => null,
                 'contentUpdateStruct' => null,
+                'struct' => null,
             ])
             ->setAllowedTypes(
                 'struct',
                 [
+                    'null',
                     ContentCreateStruct::class,
                     ContentUpdateStruct::class,
                     UserCreateStruct::class,
                     UserUpdateStruct::class,
                 ],
             )
-            ->setNormalizer('struct', static function (Options $options, $value) {
+            ->addNormalizer('struct', static function (Options $options, $value) {
                 if ($value !== null) {
                     return $value;
                 }
@@ -100,7 +102,7 @@ public function configureOptions(OptionsResolver $resolver)
                 }
 
                 return null;
-            })
+            }, true)
             ->setDeprecated(
                 'contentCreateStruct',
                 'ibexa/content-forms',

diff --git a/src/lib/Form/Type/Content/ContentFieldType.php b/src/lib/Form/Type/Content/ContentFieldType.php
@@ -59,6 +59,7 @@ public function configureOptions(OptionsResolver $resolver)
             ->setAllowedTypes(
                 'struct',
                 [
+                    'null',
                     ContentCreateStruct::class,
                     ContentUpdateStruct::class,
                     UserCreateStruct::class,