diff --git a/src/Symfony/Component/Workflow/Tests/WorkflowTest.php b/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
index 8e112df60dce5..543398a2274a3 100644
--- a/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
+++ b/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
@@ -14,6 +14,7 @@
use PHPUnit\Framework\TestCase;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\Workflow\Definition;
+use Symfony\Component\Workflow\Event\EnteredEvent;
use Symfony\Component\Workflow\Event\Event;
use Symfony\Component\Workflow\Event\GuardEvent;
use Symfony\Component\Workflow\Event\TransitionEvent;
@@ -685,6 +686,44 @@ public function testEventDefaultInitialContext()
$workflow->apply($subject, 't1');
}
+ public function testEventWhenAlreadyInThisPlace()
+ {
+ // ┌──────┐ ┌──────────────────────┐ ┌───┐ ┌─────────────┐ ┌───┐
+ // │ init │ ──▶ │ from_init_to_a_and_b │ ──▶ │ B │ ──▶ │ from_b_to_c │ ──▶ │ C │
+ // └──────┘ └──────────────────────┘ └───┘ └─────────────┘ └───┘
+ // │
+ // │
+ // ▼
+ // ┌───────────────────────────────┐
+ // │ A │
+ // └───────────────────────────────┘
+ $definition = new Definition(
+ ['init', 'A', 'B', 'C'],
+ [
+ new Transition('from_init_to_a_and_b', 'init', ['A', 'B']),
+ new Transition('from_b_to_c', 'B', 'C'),
+ ],
+ );
+
+ $subject = new Subject();
+ $dispatcher = new EventDispatcher();
+ $name = 'workflow_name';
+ $workflow = new Workflow($definition, new MethodMarkingStore(), $dispatcher, $name);
+
+ $calls = [];
+ $listener = function (Event $event) use (&$calls) {
+ $calls[] = $event;
+ };
+ $dispatcher->addListener("workflow.$name.entered.A", $listener);
+
+ $workflow->apply($subject, 'from_init_to_a_and_b');
+ $workflow->apply($subject, 'from_b_to_c');
+
+ $this->assertCount(1, $calls);
+ $this->assertInstanceOf(EnteredEvent::class, $calls[0]);
+ $this->assertSame('from_init_to_a_and_b', $calls[0]->getTransition()->getName());
+ }
+
public function testMarkingStateOnApplyWithEventDispatcher()
{
$definition = new Definition(range('a', 'f'), [new Transition('t', range('a', 'c'), range('d', 'f'))]);
diff --git a/src/Symfony/Component/Workflow/Workflow.php b/src/Symfony/Component/Workflow/Workflow.php
index 1bad55e358411..818fbc2f7b5c9 100644
--- a/src/Symfony/Component/Workflow/Workflow.php
+++ b/src/Symfony/Component/Workflow/Workflow.php
@@ -391,7 +391,13 @@ private function entered(object $subject, ?Transition $transition, Marking $mark
$this->dispatcher->dispatch($event, WorkflowEvents::ENTERED);
$this->dispatcher->dispatch($event, sprintf('workflow.%s.entered', $this->name));
- foreach ($marking->getPlaces() as $placeName => $nbToken) {
+ $placeNames = [];
+ if ($transition) {
+ $placeNames = $transition->getTos();
+ } elseif ($this->definition->getInitialPlaces()) {
+ $placeNames = $this->definition->getInitialPlaces();
+ }
+ foreach ($placeNames as $placeName) {
$this->dispatcher->dispatch($event, sprintf('workflow.%s.entered.%s', $this->name, $placeName));
}
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy