Merge pull request #236 from ProcessMaker/bugfix/FOUR-27709

nolanpro · web-flow · commit efd87970c0b2 · 2025-12-02T14:25:31.000-08:00
FOUR-27709: ABE does not work correctly when a parallel gateway is part of the flow
diff --git a/src/ProcessMaker/Nayra/Bpmn/Models/EventDefinitionBus.php b/src/ProcessMaker/Nayra/Bpmn/Models/EventDefinitionBus.php
@@ -52,6 +52,10 @@ public function registerCatchEvent(CatchEventInterface $catchEvent, EventDefinit
                 if (!$match) {
                     return;
                 }
+                $targetCatch = $sourceEventDefinition->getProperty('target_catch_event_id');
+                if ($targetCatch && $catchEvent->getId() !== $targetCatch) {
+                    return;
+                }
                 if ($catchEvent instanceof StartEventInterface && $sourceEventDefinition->getDoNotTriggerStartEvents()) {
                     return;
                 }
@@ -60,6 +64,10 @@ public function registerCatchEvent(CatchEventInterface $catchEvent, EventDefinit
                 } else {
                     $instances = $this->getInstancesFor($catchEvent);
                     foreach ($instances as $instance) {
+                        $targetInstance = $sourceEventDefinition->getProperty('target_instance_id');
+                        if ($targetInstance && $instance->getKey() !== $targetInstance) {
+                            continue;
+                        }
                         $callable($eventDefinition, $instance, $token);
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,10 @@ public function registerCatchEvent(CatchEventInterface $catchEvent, EventDefinit`
`52`	`52`	`if (!$match) {`
`53`	`53`	`return;`
`54`	`54`	`}`
	`55`	`+ $targetCatch = $sourceEventDefinition->getProperty('target_catch_event_id');`
	`56`	`+ if ($targetCatch && $catchEvent->getId() !== $targetCatch) {`
	`57`	`+ return;`
	`58`	`+ }`
`55`	`59`	`if ($catchEvent instanceof StartEventInterface && $sourceEventDefinition->getDoNotTriggerStartEvents()) {`
`56`	`60`	`return;`
`57`	`61`	`}`
`@@ -60,6 +64,10 @@ public function registerCatchEvent(CatchEventInterface $catchEvent, EventDefinit`
`60`	`64`	`} else {`
`61`	`65`	`$instances = $this->getInstancesFor($catchEvent);`
`62`	`66`	`foreach ($instances as $instance) {`
	`67`	`+ $targetInstance = $sourceEventDefinition->getProperty('target_instance_id');`
	`68`	`+ if ($targetInstance && $instance->getKey() !== $targetInstance) {`
	`69`	`+ continue;`
	`70`	`+ }`
`63`	`71`	`$callable($eventDefinition, $instance, $token);`
`64`	`72`	`}`
`65`	`73`	`}`