Skip to content

Commit ad1ac51

Browse files
Merge branch '4.0' into 4.1
* 4.0: [HttpKernel] Fixed invalid REMOTE_ADDR in inline subrequest when configuring trusted proxy with subnet [FrameworkBundle] fixed guard event names for transitions [DI] Improve class named servics error message [HttpFoundation] fixed using _method parameter with invalid type [Intl] Replace svn with git in the icu data update script [HttpFoundation] Fix Cookie::isCleared
2 parents 2e43220 + 6d2edab commit ad1ac51

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,9 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
593593
$guard = new Definition(Workflow\EventListener\GuardListener::class);
594594
$guard->setPrivate(true);
595595
$configuration = array();
596-
foreach ($workflow['transitions'] as $transitionName => $config) {
596+
foreach ($workflow['transitions'] as $config) {
597+
$transitionName = $config['name'];
598+
597599
if (!isset($config['guard'])) {
598600
continue;
599601
}

0 commit comments

Comments
 (0)