Make sure the events are dispatched in the correct order

symfony · Nyholm · Jun 25, 2017 · Jun 26, 2017 · Jun 26, 2017 · Jun 26, 2017
commit 30728d999c4f579dff052e61da5587f34bd76b6e
diff --git a/src/Symfony/Component/Workflow/Tests/WorkflowTest.php b/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
@@ -263,11 +263,11 @@ public function testApplyWithEventDispatcher()
            'workflow.workflow_name.entered.b',
            'workflow.workflow_name.entered.c',
            // Following events are fired because of announce() method
-            'workflow.announce',
-            'workflow.workflow_name.announce',
            'workflow.guard',
            'workflow.workflow_name.guard',
            'workflow.workflow_name.guard.t2',
+            'workflow.announce',
+            'workflow.workflow_name.announce',
            'workflow.workflow_name.announce.t2',
        );


diff --git a/src/Symfony/Component/Workflow/Workflow.php b/src/Symfony/Component/Workflow/Workflow.php
@@ -300,10 +300,13 @@ private function announce($subject, Transition $initialTransition, Marking $mark

        $event = new Event($subject, $marking, $initialTransition);

-        $this->dispatcher->dispatch('workflow.announce', $event);
-        $this->dispatcher->dispatch(sprintf('workflow.%s.announce', $this->name), $event);
-
+        $eventsDispatched = false;
        foreach ($this->getEnabledTransitions($subject) as $transition) {
+            if (!$eventsDispatched) {
+                $this->dispatcher->dispatch('workflow.announce', $event);
+                $this->dispatcher->dispatch(sprintf('workflow.%s.announce', $this->name), $event);
+                $eventsDispatched = true;
+            }
            $this->dispatcher->dispatch(sprintf('workflow.%s.announce.%s', $this->name, $transition->getName()), $event);
        }
    }