bugfix(61581): [FrameworkBundle] [Config] Update workflow config places callback

KevinVanSonsbeek · KevinVanSonsbeek · commit 5121921567ba · 2025-09-02T22:17:53.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -473,27 +473,34 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode): void
                                                     throw new InvalidConfigurationException('The "places" option must be an array in workflow configuration.');
                                                 }
 
-                                                // It's an indexed array of shape  ['place1', 'place2']
-                                                if (isset($places[0]) && \is_string($places[0])) {
-                                                    return array_map(function (string $place) {
-                                                        return ['name' => $place];
-                                                    }, $places);
-                                                }
+                                                $normalizedPlaces = [];
+                                                foreach ($places as $key => $value) {
+                                                    if (\is_int($key)) {
+                                                        if (\is_string($value)) {
+                                                            $normalizedPlaces[] = ['name' => $value];
+                                                            continue;
+                                                        }
+
+                                                        if (\is_array($value)) {
+                                                            $normalizedPlaces[] = $value;
+                                                            continue;
+                                                        }
+                                                    }
 
-                                                // It's an indexed array, we let the validation occur
-                                                if (isset($places[0]) && \is_array($places[0])) {
-                                                    return $places;
-                                                }
+                                                    if (\is_array($value)) {
+                                                        if (\array_key_exists('name', $value)) {
+                                                            $normalizedPlaces[] = $value;
+                                                            continue;
+                                                        }
 
-                                                foreach ($places as $name => $place) {
-                                                    if (\is_array($place) && \array_key_exists('name', $place)) {
+                                                        $normalizedPlaces[] = array_merge(['name' => $key], $value);
                                                         continue;
+                                                    } elseif (null === $value) {
+                                                        $normalizedPlaces[] = ['name' => $key];
                                                     }
-                                                    $place['name'] = $name;
-                                                    $places[$name] = $place;
                                                 }
 
-                                                return array_values($places);
+                                                return array_values($normalizedPlaces);
                                             })
                                         ->end()
                                         ->isRequired()
