[WIP] Multiple paths improvements

src/Definition/Bpmn2Reader.php

@@ -42,7 +42,7 @@ public function read($file)
      *
      * @throws IdAttributeNotFoundException
      *
-     * @since Method available since Release 1.3.0
+     * @since 1.3.0
      */
     public function readSource($source)
     {
@@ -63,7 +63,7 @@ public function readSource($source)
      *
      * @throws IdAttributeNotFoundException
      *
-     * @since Method available since Release 1.3.0
+     * @since 1.3.0
      */
     private function readDocument(\DOMDocument $document, $workflowId = null)
     {
@@ -251,7 +251,7 @@ private function createIdAttributeNotFoundException(\DOMElement $element, $workf
      *
      * @return string
      *
-     * @since Method available since Release 1.3.0
+     * @since 1.3.0
      */
     private function provideRoleIdForFlowObject(array $flowObjectRoles, $flowObjectId)
     {

src/Process/Process.php

@@ -35,14 +35,14 @@ class Process
     /**
      * @var ExpressionLanguage
      *
-     * @since Property available since Release 1.2.0
+     * @since 1.2.0
      */
     private $expressionLanguage;
 
     /**
      * @var OperationRunnerInterface
      *
-     * @since Property available since Release 1.2.0
+     * @since 1.2.0
      */
     private $operationRunner;
 
@@ -61,7 +61,7 @@ public function __construct($workflowContext, WorkflowRepositoryInterface $workf
     /**
      * @param ExpressionLanguage $expressionLanguage
      *
-     * @since Method available since Release 1.2.0
+     * @since 1.2.0
      */
     public function setExpressionLanguage(ExpressionLanguage $expressionLanguage)
     {
@@ -143,14 +143,14 @@ public function executeWorkItem(WorkItemContextInterface $workItemContext)
         if ($activity->isAllocatable()) {
             $this->allocateWorkItem($workItemContext);
             $nextWorkItemContext = new WorkItemContext($workItemContext->getParticipant());
-            $nextWorkItemContext->setActivityId($workItemContext->getProcessContext()->getWorkflow()->getCurrentFlowObject()->getId());
+            $nextWorkItemContext->setActivityId($workItemContext->getActivityId());
             $nextWorkItemContext->setProcessContext($workItemContext->getProcessContext());
 
             return $this->executeWorkItem($nextWorkItemContext);
         } elseif ($activity->isStartable()) {
             $this->startWorkItem($workItemContext);
             $nextWorkItemContext = new WorkItemContext($workItemContext->getParticipant());
-            $nextWorkItemContext->setActivityId($workItemContext->getProcessContext()->getWorkflow()->getCurrentFlowObject()->getId());
+            $nextWorkItemContext->setActivityId($workItemContext->getActivityId());
             $nextWorkItemContext->setProcessContext($workItemContext->getProcessContext());
 
             return $this->executeWorkItem($nextWorkItemContext);
@@ -164,7 +164,7 @@ public function executeWorkItem(WorkItemContextInterface $workItemContext)
     /**
      * @return int|string|WorkflowContextInterface
      *
-     * @since Method available since Release 1.1.0
+     * @since 1.1.0
      */
     public function getWorkflowContext()
     {
@@ -192,7 +192,7 @@ private function createWorkflow()
      *
      * @return Workflow
      *
-     * @since Method available since Release 1.2.0
+     * @since 1.2.0
      */
     private function configureWorkflow(Workflow $workflow)
     {

src/Process/WorkItemContext.php

@@ -66,7 +66,7 @@ public function getActivityId()
     /**
      * @param ParticipantInterface $participant
      *
-     * @since Method available since Release 1.1.0
+     * @since 1.1.0
      */
     public function setParticipant(ParticipantInterface $participant)
     {

src/Process/WorkflowContextInterface.php

@@ -13,7 +13,7 @@
 namespace PHPMentors\Workflower\Process;
 
 /**
- * @since Interface available since Release 1.1.0
+ * @since 1.1.0
  */
 interface WorkflowContextInterface
 {

src/Workflow/Activity/SendTask.php

@@ -17,7 +17,7 @@
 use PHPMentors\Workflower\Workflow\Resource\MessageInterface;
 
 /**
- * @since Class available since Release 1.3.0
+ * @since 1.3.0
  */
 class SendTask extends Task implements MessageInterface, OperationalInterface
 {

src/Workflow/Activity/ServiceTask.php

@@ -16,7 +16,7 @@
 use PHPMentors\Workflower\Workflow\Participant\Role;
 
 /**
- * @since Class available since Release 1.2.0
+ * @since 1.2.0
  */
 class ServiceTask extends Task implements OperationalInterface
 {

src/Workflow/Activity/Task.php

@@ -46,7 +46,7 @@ class Task implements ActivityInterface, \Serializable
     /**
      * @var Token
      *
-     * @since Property available since Release 2.0.0
+     * @since 2.0.0
      */
     private $token;
 

src/Workflow/Element/ConnectingObjectCollection.php

@@ -102,7 +102,7 @@ public function filterBySource(TransitionalInterface $flowObject)
      *
      * @return ConnectingObjectCollection
      *
-     * @since Method available since Release 2.0.0
+     * @since 2.0.0
      */
     public function filterByDestination(TransitionalInterface $flowObject): ConnectingObjectCollection
     {

src/Workflow/Element/FlowObjectInterface.php

@@ -19,7 +19,7 @@ interface FlowObjectInterface extends RoleAwareInterface, WorkflowElementInterfa
     /**
      * @param Token $token
      *
-     * @since Method available since Release 2.0.0
+     * @since 2.0.0
      */
     public function attachToken(Token $token): void;
 }

src/Workflow/Event/EndEvent.php

@@ -19,21 +19,21 @@ class EndEvent extends Event implements EventInterface
     /**
      * @var Token
      *
-     * @since Property available since Release 2.0.0
+     * @since 2.0.0
      */
     private $token;
 
     /**
      * @var \DateTime
      *
-     * @since Property available since Release 2.0.0
+     * @since 2.0.0
      */
     private $endDate;
 
     /**
      * {@inheritdoc}
      *
-     * @since Method available since Release 2.0.0
+     * @since 2.0.0
      */
     public function serialize()
     {

src/Workflow/Event/StartEvent.php

@@ -20,21 +20,21 @@ class StartEvent extends Event implements EventInterface, TransitionalInterface,
     /**
      * @var Token
      *
-     * @since Property available since Release 2.0.0
+     * @since 2.0.0
      */
     private $token;
 
     /**
      * @var \DateTime
      *
-     * @since Property available since Release 2.0.0
+     * @since 2.0.0
      */
     private $startDate;
 
     /**
      * {@inheritdoc}
      *
-     * @since Method available since Release 2.0.0
+     * @since 2.0.0
      */
     public function serialize()
     {

src/Workflow/Gateway/ExclusiveGateway.php

@@ -41,7 +41,7 @@ class ExclusiveGateway implements GatewayInterface, ConditionalInterface, \Seria
     /**
      * @var Token
      *
-     * @since Property available since Release 2.0.0
+     * @since 2.0.0
      */
     private $token;
 

src/Workflow/Gateway/ParallelGateway.php

@@ -16,7 +16,7 @@
 use PHPMentors\Workflower\Workflow\Participant\Role;
 
 /**
- * @since Class available since Release 2.0.0
+ * @since 2.0.0
  */
 class ParallelGateway implements GatewayInterface, \Serializable
 {

src/Workflow/Operation/OperationRunnerInterface.php

@@ -16,7 +16,7 @@
 use PHPMentors\Workflower\Workflow\Workflow;
 
 /**
- * @since Interface available since Release 1.2.0
+ * @since 1.2.0
  */
 interface OperationRunnerInterface
 {

src/Workflow/Operation/OperationalInterface.php

@@ -13,7 +13,7 @@
 namespace PHPMentors\Workflower\Workflow\Operation;
 
 /**
- * @since Interface available since Release 1.2.0
+ * @since 1.2.0
  */
 interface OperationalInterface
 {

src/Workflow/Resource/MessageInterface.php

@@ -13,7 +13,7 @@
 namespace PHPMentors\Workflower\Workflow\Resource;
 
 /**
- * @since Interface available since Release 1.3.0
+ * @since 1.3.0
  */
 interface MessageInterface
 {

src/Workflow/TokenRegistry.php

@@ -0,0 +1,46 @@
+<?php
+/*
+ * Copyright (c) Atsuhiro Kubo <[email protected]> and contributors,
+ * All rights reserved.
+ *
+ * This file is part of Workflower.
+ *
+ * This program and the accompanying materials are made available under
+ * the terms of the BSD 2-Clause License which accompanies this
+ * distribution, and is available at http://opensource.org/licenses/BSD-2-Clause
+ */
+
+namespace PHPMentors\Workflower\Workflow;
+
+use PHPMentors\Workflower\Workflow\Element\Token;
+use PHPMentors\Workflower\Workflow\Event\EndEvent;
+
+/**
+ * @since 2.0.0
+ */
+class TokenRegistry
+{
+    private $tokens = [];
+
+    public function register(Token $token): void
+    {
+        $this->tokens[$token->getId()] = $token;
+    }
+
+    public function remove(Token $token): void
+    {
+        unset($this->tokens[$token->getId()]);
+    }
+
+    public function getTokens(): array
+    {
+        return array_values($this->tokens);
+    }
+
+    public function getActiveTokens(): array
+    {
+        return array_values(array_filter($this->tokens, function (Token $token) {
+            return !($token->getCurrentFlowObject() instanceof EndEvent);
+        }));
+    }
+}