Merge branch '6.4' into 7.2

alexandre-daubois · alexandre-daubois · commit f086ae846417 · 2025-04-16T08:57:17.000+02:00
* 6.4:
  [GitHub] Update .github/PULL_REQUEST_TEMPLATE.md to remove SF 7.1 as it's not supported anymore
  [Workflow] Fix dispatch of entered event when the subject is already in this marking
diff --git a/Tests/WorkflowTest.php b/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;
@@ -689,6 +690,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/Workflow.php b/Workflow.php
@@ -385,7 +385,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));
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,13 @@ private function entered(object $subject, ?Transition $transition, Marking $mark`
`385`	`385`	`$this->dispatcher->dispatch($event, WorkflowEvents::ENTERED);`
`386`	`386`	`$this->dispatcher->dispatch($event, \sprintf('workflow.%s.entered', $this->name));`
`387`	`387`
`388`		`- foreach ($marking->getPlaces() as $placeName => $nbToken) {`
	`388`	`+ $placeNames = [];`
	`389`	`+ if ($transition) {`
	`390`	`+ $placeNames = $transition->getTos();`
	`391`	`+ } elseif ($this->definition->getInitialPlaces()) {`
	`392`	`+ $placeNames = $this->definition->getInitialPlaces();`
	`393`	`+ }`
	`394`	`+ foreach ($placeNames as $placeName) {`
`389`	`395`	`$this->dispatcher->dispatch($event, \sprintf('workflow.%s.entered.%s', $this->name, $placeName));`
`390`	`396`	`}`
`391`	`397`	`}`