Skip to content

Commit 6d2edab

Browse files
Merge branch '3.4' into 4.0
* 3.4: [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 13d2e06 + cee4b49 commit 6d2edab

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
@@ -525,7 +525,9 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
525525
$guard = new Definition(Workflow\EventListener\GuardListener::class);
526526
$guard->setPrivate(true);
527527
$configuration = array();
528-
foreach ($workflow['transitions'] as $transitionName => $config) {
528+
foreach ($workflow['transitions'] as $config) {
529+
$transitionName = $config['name'];
530+
529531
if (!isset($config['guard'])) {
530532
continue;
531533
}

0 commit comments

Comments
 (0)