fixed marking states in leave events

HeahDude · HeahDude · commit 01ffe81834ed · 2017-03-06T00:20:59.000+01:00
diff --git a/src/Symfony/Component/Workflow/Tests/WorkflowTest.php b/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
@@ -274,16 +274,13 @@ public function testMarkingStateOnApplyWithEventDispatcher()
             $this->assertEquals(new Marking($initialState), $event->getMarking());
         });
         $dispatcher->addListener('workflow.test.leave.a', function (Event $event) use ($initialState) {
-            // Fails
-            //$this->assertEquals(new Marking($initialState), $event->getMarking());
+            $this->assertEquals(new Marking($initialState), $event->getMarking());
         });
         $dispatcher->addListener('workflow.test.leave.b', function (Event $event) use ($initialState) {
-            // Fails
-            //$this->assertEquals(new Marking($initialState), $event->getMarking());
+            $this->assertEquals(new Marking($initialState), $event->getMarking());
         });
         $dispatcher->addListener('workflow.test.leave.c', function (Event $event) use ($initialState) {
-            // Fails
-            //$this->assertEquals(new Marking($initialState), $event->getMarking());
+            $this->assertEquals(new Marking($initialState), $event->getMarking());
         });
         $dispatcher->addListener('workflow.transition', function (Event $event) use ($transitionState) {
             $this->assertEquals(new Marking($transitionState), $event->getMarking());
diff --git a/src/Symfony/Component/Workflow/Workflow.php b/src/Symfony/Component/Workflow/Workflow.php
@@ -223,20 +223,22 @@ private function guardTransition($subject, Marking $marking, Transition $transit
 
     private function leave($subject, Transition $transition, Marking $marking)
     {
+        $froms = $transition->getFroms();
+
         if (null !== $this->dispatcher) {
             $event = new Event($subject, $marking, $transition);
 
             $this->dispatcher->dispatch('workflow.leave', $event);
             $this->dispatcher->dispatch(sprintf('workflow.%s.leave', $this->name), $event);
-        }
-
-        foreach ($transition->getFroms() as $place) {
-            $marking->unmark($place);
 
-            if (null !== $this->dispatcher) {
+            foreach ($froms as $place) {
                 $this->dispatcher->dispatch(sprintf('workflow.%s.leave.%s', $this->name, $place), $event);
             }
         }
+
+        foreach ($froms as $place) {
+            $marking->unmark($place);
+        }
     }
 
     private function transition($subject, Transition $transition, Marking $marking)

Original file line number	Diff line number	Diff line change
`@@ -223,20 +223,22 @@ private function guardTransition($subject, Marking $marking, Transition $transit`
`223`	`223`
`224`	`224`	`private function leave($subject, Transition $transition, Marking $marking)`
`225`	`225`	`{`
	`226`	`+ $froms = $transition->getFroms();`
	`227`	`+`
`226`	`228`	`if (null !== $this->dispatcher) {`
`227`	`229`	`$event = new Event($subject, $marking, $transition);`
`228`	`230`
`229`	`231`	`$this->dispatcher->dispatch('workflow.leave', $event);`
`230`	`232`	`$this->dispatcher->dispatch(sprintf('workflow.%s.leave', $this->name), $event);`
`231`		`- }`
`232`		`-`
`233`		`- foreach ($transition->getFroms() as $place) {`
`234`		`- $marking->unmark($place);`
`235`	`233`
`236`		`- if (null !== $this->dispatcher) {`
	`234`	`+ foreach ($froms as $place) {`
`237`	`235`	`$this->dispatcher->dispatch(sprintf('workflow.%s.leave.%s', $this->name, $place), $event);`
`238`	`236`	`}`
`239`	`237`	`}`
	`238`	`+`
	`239`	`+ foreach ($froms as $place) {`
	`240`	`+ $marking->unmark($place);`
	`241`	`+ }`
`240`	`242`	`}`
`241`	`243`
`242`	`244`	`private function transition($subject, Transition $transition, Marking $marking)`