[FrameworkBundle] Perform-no-deep-merging on workflow transitions' from/to configs

nicolas-grekas · nicolas-grekas · commit 955a0ba27e9f · 2025-09-15T18:11:08.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -505,26 +505,20 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode): void
                                     ->end()
                                     ->arrayNode('transitions')
                                         ->beforeNormalization()
-                                            ->always()
-                                            ->then(function ($transitions) {
+                                            ->always(static function ($transitions) {
                                                 if (!\is_array($transitions)) {
                                                     throw new InvalidConfigurationException('The "transitions" option must be an array in workflow configuration.');
                                                 }
 
-                                                // It's an indexed array, we let the validation occur
-                                                if (isset($transitions[0]) && \is_array($transitions[0])) {
-                                                    return $transitions;
-                                                }
-
+                                                $normalizedTransitions = [];
                                                 foreach ($transitions as $name => $transition) {
-                                                    if (\is_array($transition) && \array_key_exists('name', $transition)) {
-                                                        continue;
+                                                    if (\is_string($name) && \is_array($transition)) {
+                                                        $transition['name'] ??= $name;
                                                     }
-                                                    $transition['name'] = $name;
-                                                    $transitions[$name] = $transition;
+                                                    $normalizedTransitions[$name] = $transition;
                                                 }
 
-                                                return $transitions;
+                                                return $normalizedTransitions;
                                             })
                                         ->end()
                                         ->isRequired()
@@ -541,6 +535,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode): void
                                                     ->example('is_fully_authenticated() and is_granted(\'ROLE_JOURNALIST\') and subject.getTitle() == \'My first article\'')
                                                 ->end()
                                                 ->arrayNode('from')
+                                                    ->performNoDeepMerging()
                                                     ->beforeNormalization()
                                                         ->ifString()
                                                         ->then(fn ($v) => [$v])
@@ -551,6 +546,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode): void
                                                     ->end()
                                                 ->end()
                                                 ->arrayNode('to')
+                                                    ->performNoDeepMerging()
                                                     ->beforeNormalization()
                                                         ->ifString()
                                                         ->then(fn ($v) => [$v])
