"Improve normalization logic in Configuration for type handling and validation."

Author: tomkalon

src/TwigHooks/src/DependencyInjection/Configuration.php

@@ -22,6 +22,9 @@
 
 final class Configuration implements ConfigurationInterface
 {
+    /**
+     * @return TreeBuilder<'array'>
+     */
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('sylius_twig_hooks');
@@ -69,6 +72,7 @@ private function addHooksConfiguration(ArrayNodeDefinition $rootNode): void
                         ->arrayPrototype()
                             ->beforeNormalization()
                                 ->always(function ($v) {
+                                    $isTypeDefined = isset($v['type']);
                                     $isComponentDefined = isset($v['component']);
                                     $isTemplateDefined = isset($v['template']);
                                     $isDisabled = isset($v['enabled']) && $v['enabled'] === false;
@@ -77,6 +81,10 @@ private function addHooksConfiguration(ArrayNodeDefinition $rootNode): void
                                         return $v;
                                     }
 
+                                    if (true === $isTypeDefined) {
+                                        return $v;
+                                    }
+
                                     $v['type'] = match (true) {
                                         $isDisabled => 'disabled',
                                         $isComponentDefined => 'component',
@@ -89,6 +97,16 @@ private function addHooksConfiguration(ArrayNodeDefinition $rootNode): void
                             ->end()
                             ->validate()
                                 ->always(static function ($v) {
+                                    $type = $v['type'] ?? null;
+                                    if ('template' === $type) {
+                                        $v['component'] = null;
+                                        $v['props'] = [];
+                                    }
+
+                                    if ('component' === $type) {
+                                        $v['template'] = null;
+                                    }
+
                                     $component = $v['component'] ?? null;
                                     $template = $v['template'] ?? null;
                                     $enabled = $v['enabled'] ?? true;