Merge pull request #6620 from christianbeeznest/storm-22851

Admin: Ignore null settings before resolve - refs BT#22851

Author: christianbeeznest

src/CoreBundle/Settings/CatalogSettingsSchema.php

@@ -43,18 +43,18 @@ public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('course_catalog_settings', TextareaType::class, [
-                'attr' => ['rows' => 10],
+                'attr' => ['rows' => 10, 'cols' => 100],
             ])
             ->add('session_catalog_settings', TextareaType::class, [
-                'attr' => ['rows' => 5],
+                'attr' => ['rows' => 8, 'cols' => 100],
             ])
             ->add('show_courses_descriptions_in_catalog', YesNoType::class)
             ->add('course_catalog_published', YesNoType::class)
             ->add('course_catalog_display_in_home', YesNoType::class)
             ->add('hide_public_link', YesNoType::class)
             ->add('only_show_selected_courses', YesNoType::class)
             ->add('only_show_course_from_selected_category', TextareaType::class, [
-                'attr' => ['rows' => 3, 'style' => 'font-family: monospace;'],
+                'attr' => ['rows' => 10, 'cols' => 100, 'style' => 'font-family: monospace;'],
             ])
             ->add('allow_students_to_browse_courses', YesNoType::class)
             ->add('course_catalog_hide_private', YesNoType::class)

src/CoreBundle/Settings/SettingsManager.php

@@ -225,6 +225,7 @@ public function loadAll(): void
                 }
             }
 
+            $knownParameters = $this->normalizeNullsBeforeResolve($knownParameters, $settingsBuilder);
             $parameters = $settingsBuilder->resolve($knownParameters);
             $settings->setParameters($parameters);
             $schemaList[$name] = $settings;
@@ -268,7 +269,7 @@ public function load(string $schemaAlias, ?string $namespace = null, bool $ignor
                 $parameters[$parameter] = $transformer->reverseTransform($parameters[$parameter]);
             }
         }
-
+        $parameters = $this->normalizeNullsBeforeResolve($parameters, $settingsBuilder);
         $parameters = $settingsBuilder->resolve($parameters);
         $settings->setParameters($parameters);
 
@@ -284,7 +285,9 @@ public function update(SettingsInterface $settings): void
 
         $settingsBuilder = new SettingsBuilder();
         $schema->buildSettings($settingsBuilder);
-        $parameters = $settingsBuilder->resolve($settings->getParameters());
+        $raw = $settings->getParameters();
+        $raw = $this->normalizeNullsBeforeResolve($raw, $settingsBuilder);
+        $parameters = $settingsBuilder->resolve($raw);
         // Transform value. Example array to string using transformer. Example:
         // 1. Setting "tool_visible_by_default_at_creation" it's a multiple select
         // 2. Is defined as an array in class DocumentSettingsSchema
@@ -346,7 +349,9 @@ public function save(SettingsInterface $settings): void
 
         $settingsBuilder = new SettingsBuilder();
         $schema->buildSettings($settingsBuilder);
-        $parameters = $settingsBuilder->resolve($settings->getParameters());
+        $raw = $settings->getParameters();
+        $raw = $this->normalizeNullsBeforeResolve($raw, $settingsBuilder);
+        $parameters = $settingsBuilder->resolve($raw);
         // Transform value. Example array to string using transformer. Example:
         // 1. Setting "tool_visible_by_default_at_creation" it's a multiple select
         // 2. Is defined as an array in class DocumentSettingsSchema
@@ -1017,4 +1022,14 @@ private function transformToString($value): string
 
         return (string) $value;
     }
+
+    private function normalizeNullsBeforeResolve(array $parameters, SettingsBuilder $settingsBuilder): array
+    {
+        foreach ($parameters as $k => $v) {
+            if ($v === null && $settingsBuilder->isDefined($k)) {
+                unset($parameters[$k]);
+            }
+        }
+        return $parameters;
+    }
 }