From 9bb58b820d3301d7c35748ffa1fdc7d7135b81ff Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Fri, 20 Jan 2017 14:53:10 +0100
Subject: [PATCH 1/9] III-1804: Moved Metadata classes to subdirectory.

---
 bootstrap.php                                             | 4 ++--
 .../Metadata.php}                                         | 4 ++--
 .../StaticallyConfiguredSagaMetadataFactory.php}          | 8 ++++----
 tests/UiTPASEventSagaTest.php                             | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename src/Broadway/Saga/{NamespacedEventsMetadata.php => Metadata/Metadata.php} (87%)
 rename src/Broadway/Saga/{StaticallyConfiguredSagaNamespacedEventsMetadataFactory.php => Metadata/StaticallyConfiguredSagaMetadataFactory.php} (68%)

diff --git a/bootstrap.php b/bootstrap.php
index 04433db..2afac3d 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -19,7 +19,7 @@
 use CultuurNet\UDB3\EventSourcing\ExecutionContextMetadataEnricher;
 use CultuurNet\UDB3\LabelCollection;
 use CultuurNet\UDB3\SimpleEventBus;
-use CultuurNet\UDB3\UiTPASService\Broadway\Saga\StaticallyConfiguredSagaNamespacedEventsMetadataFactory;
+use CultuurNet\UDB3\UiTPASService\Broadway\Saga\Metadata\StaticallyConfiguredSagaMetadataFactory;
 use CultuurNet\UDB3\UiTPASService\OrganizerLabelReadRepository\JSONLDOrganizerLabelReadRepository;
 use CultuurNet\UDB3\UiTPASService\Permissions\DefaultEventPermission;
 use CultuurNet\UDB3\UiTPASService\Permissions\UDB3EventPermission;
@@ -473,7 +473,7 @@ function (Application $app) {
                 $app['saga_repository'],
                 new Broadway\UuidGenerator\Rfc4122\Version4Generator()
             ),
-            new StaticallyConfiguredSagaNamespacedEventsMetadataFactory(),
+            new StaticallyConfiguredSagaMetadataFactory(),
             new EventDispatcher()
         );
     }
diff --git a/src/Broadway/Saga/NamespacedEventsMetadata.php b/src/Broadway/Saga/Metadata/Metadata.php
similarity index 87%
rename from src/Broadway/Saga/NamespacedEventsMetadata.php
rename to src/Broadway/Saga/Metadata/Metadata.php
index a39d6ba..06de91b 100644
--- a/src/Broadway/Saga/NamespacedEventsMetadata.php
+++ b/src/Broadway/Saga/Metadata/Metadata.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CultuurNet\UDB3\UiTPASService\Broadway\Saga;
+namespace CultuurNet\UDB3\UiTPASService\Broadway\Saga\Metadata;
 
 use Broadway\Saga\MetadataInterface;
 
@@ -8,7 +8,7 @@
  * Copied from Broadway\Saga\Metadata\Metadata and modified to work with
  * namespaced event names.
  */
-class NamespacedEventsMetadata implements MetadataInterface
+class Metadata implements MetadataInterface
 {
     private $criteria;
 
diff --git a/src/Broadway/Saga/StaticallyConfiguredSagaNamespacedEventsMetadataFactory.php b/src/Broadway/Saga/Metadata/StaticallyConfiguredSagaMetadataFactory.php
similarity index 68%
rename from src/Broadway/Saga/StaticallyConfiguredSagaNamespacedEventsMetadataFactory.php
rename to src/Broadway/Saga/Metadata/StaticallyConfiguredSagaMetadataFactory.php
index 03f9cf5..d105d18 100644
--- a/src/Broadway/Saga/StaticallyConfiguredSagaNamespacedEventsMetadataFactory.php
+++ b/src/Broadway/Saga/Metadata/StaticallyConfiguredSagaMetadataFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace CultuurNet\UDB3\UiTPASService\Broadway\Saga;
+namespace CultuurNet\UDB3\UiTPASService\Broadway\Saga\Metadata;
 
 use Broadway\Saga\Metadata\MetadataFactoryInterface;
 use Broadway\Saga\Metadata\StaticallyConfiguredSagaInterface;
 
 /**
  * Copied from Broadway\Saga\Metadata\StaticallyConfiguredSagaMetadataFactory
- * and modified to return an instance of NamespacedEventsMetadata.
+ * and modified to return an instance of Metadata.
  */
-class StaticallyConfiguredSagaNamespacedEventsMetadataFactory implements MetadataFactoryInterface
+class StaticallyConfiguredSagaMetadataFactory implements MetadataFactoryInterface
 {
     /**
      * {@inheritDoc}
@@ -24,6 +24,6 @@ public function create($saga)
 
         $criteria = $saga::configuration();
 
-        return new NamespacedEventsMetadata($criteria);
+        return new Metadata($criteria);
     }
 }
diff --git a/tests/UiTPASEventSagaTest.php b/tests/UiTPASEventSagaTest.php
index 36da39c..7775a89 100644
--- a/tests/UiTPASEventSagaTest.php
+++ b/tests/UiTPASEventSagaTest.php
@@ -36,7 +36,7 @@
 use CultuurNet\UDB3\PriceInfo\PriceInfo;
 use CultuurNet\UDB3\PriceInfo\Tariff;
 use CultuurNet\UDB3\Title;
-use CultuurNet\UDB3\UiTPASService\Broadway\Saga\StaticallyConfiguredSagaNamespacedEventsMetadataFactory;
+use CultuurNet\UDB3\UiTPASService\Broadway\Saga\Metadata\StaticallyConfiguredSagaMetadataFactory;
 use CultuurNet\UDB3\UiTPASService\OrganizerLabelReadRepository\OrganizerLabelReadRepositoryInterface;
 use CultuurNet\UDB3\UiTPASService\Sync\Command\RegisterUiTPASEvent;
 use CultuurNet\UDB3\UiTPASService\Sync\Command\UpdateUiTPASEvent;
@@ -212,7 +212,7 @@ protected function createScenario()
             $sagaStateRepository,
             [$saga],
             new StateManager($sagaStateRepository, new Version4Generator()),
-            new StaticallyConfiguredSagaNamespacedEventsMetadataFactory(),
+            new StaticallyConfiguredSagaMetadataFactory(),
             new EventDispatcher()
         );
         return new Scenario($this, $sagaManager, $traceableCommandBus);

From 94c98ec3bc0bd9c4c3e4250936d7312ba3627839 Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Fri, 20 Jan 2017 14:53:49 +0100
Subject: [PATCH 2/9] III-1804: Custom saga StateManagerInterface,
 (State)RepositoryInterface, and implementations.

---
 src/Broadway/Saga/State/MongoDBRepository.php | 72 +++++++++++++++++++
 .../Saga/State/RepositoryInterface.php        | 26 +++++++
 src/Broadway/Saga/State/StateManager.php      | 40 +++++++++++
 .../Saga/State/StateManagerInterface.php      | 26 +++++++
 4 files changed, 164 insertions(+)
 create mode 100644 src/Broadway/Saga/State/MongoDBRepository.php
 create mode 100644 src/Broadway/Saga/State/RepositoryInterface.php
 create mode 100644 src/Broadway/Saga/State/StateManager.php
 create mode 100644 src/Broadway/Saga/State/StateManagerInterface.php

diff --git a/src/Broadway/Saga/State/MongoDBRepository.php b/src/Broadway/Saga/State/MongoDBRepository.php
new file mode 100644
index 0000000..fbea050
--- /dev/null
+++ b/src/Broadway/Saga/State/MongoDBRepository.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace CultuurNet\UDB3\UiTPASService\Broadway\Saga\State;
+
+use Broadway\Saga\State;
+use Broadway\Saga\State\Criteria;
+use Doctrine\MongoDB\Collection;
+use Doctrine\MongoDB\Query\Query;
+
+/**
+ * Copied from Broadway\Saga\State\MongoDBRepository and updated
+ * to implement findBy() instead of findOneBy().
+ */
+class MongoDBRepository implements RepositoryInterface
+{
+    private $collection;
+
+    /**
+     * @param Collection $collection
+     */
+    public function __construct(Collection $collection)
+    {
+        $this->collection = $collection;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function findBy(Criteria $criteria, $sagaId)
+    {
+        $query   = $this->createQuery($criteria, $sagaId);
+        $results = $query->execute();
+
+        foreach ($results as $result) {
+            yield State::deserialize($result);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function save(State $state, $sagaId)
+    {
+        $serializedState            = $state->serialize();
+        $serializedState['_id']     = $serializedState['id'];
+        $serializedState['sagaId']  = $sagaId;
+        $serializedState['removed'] = $state->isDone();
+
+        $this->collection->save($serializedState);
+    }
+
+    /**
+     * @param Criteria $criteria
+     * @param string $sagaId
+     * @return Query
+     */
+    private function createQuery(Criteria $criteria, $sagaId)
+    {
+        $comparisons = $criteria->getComparisons();
+        $wheres      = [];
+
+        foreach ($comparisons as $key => $value) {
+            $wheres['values.' . $key] = $value;
+        }
+
+        $queryBuilder = $this->collection->createQueryBuilder()
+            ->addAnd($wheres)
+            ->addAnd(['removed' => false, 'sagaId' => $sagaId]);
+
+        return $queryBuilder->getQuery();
+    }
+}
diff --git a/src/Broadway/Saga/State/RepositoryInterface.php b/src/Broadway/Saga/State/RepositoryInterface.php
new file mode 100644
index 0000000..8e0e7b5
--- /dev/null
+++ b/src/Broadway/Saga/State/RepositoryInterface.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace CultuurNet\UDB3\UiTPASService\Broadway\Saga\State;
+
+use Broadway\Saga\State;
+use Broadway\Saga\State\Criteria;
+
+/**
+ * Copied from Broadway\Saga\State\RepositoryInterface and updated to use
+ * findBy() instead of findOneBy().
+ */
+interface RepositoryInterface
+{
+    /**
+     * @param Criteria $criteria
+     * @param string $sagaId
+     * @return \Generator|State[]
+     */
+    public function findBy(Criteria $criteria, $sagaId);
+
+    /**
+     * @param State $state
+     * @param string $sagaId
+     */
+    public function save(State $state, $sagaId);
+}
diff --git a/src/Broadway/Saga/State/StateManager.php b/src/Broadway/Saga/State/StateManager.php
new file mode 100644
index 0000000..ce9eed6
--- /dev/null
+++ b/src/Broadway/Saga/State/StateManager.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace CultuurNet\UDB3\UiTPASService\Broadway\Saga\State;
+
+use Broadway\Saga\State;
+use Broadway\UuidGenerator\UuidGeneratorInterface;
+
+/**
+ * Copied from Broadway\Saga\State\StateManager to use findBy() instead of
+ * findOneBy(), and add generateNewState().
+ */
+class StateManager implements StateManagerInterface
+{
+    private $repository;
+    private $generator;
+
+    public function __construct(RepositoryInterface $repository, UuidGeneratorInterface $generator)
+    {
+        $this->repository = $repository;
+        $this->generator  = $generator;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function findBy($criteria, $sagaId)
+    {
+        // @todo Use "yield from" when minimum requirement is PHP7.
+        foreach ($this->repository->findBy($criteria, $sagaId) as $state) {
+            yield $state;
+        }
+    }
+
+    /**
+     * @return State
+     */
+    public function generateNewState() {
+        return new State($this->generator->generate());
+    }
+}
diff --git a/src/Broadway/Saga/State/StateManagerInterface.php b/src/Broadway/Saga/State/StateManagerInterface.php
new file mode 100644
index 0000000..f567511
--- /dev/null
+++ b/src/Broadway/Saga/State/StateManagerInterface.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace CultuurNet\UDB3\UiTPASService\Broadway\Saga\State;
+
+use Broadway\Saga\State;
+use Broadway\Saga\State\Criteria;
+
+/**
+ * Copied from Broadway\Saga\State\StateManagerInterface to use findBy() instead
+ * of findOneBy().
+ */
+interface StateManagerInterface
+{
+    /**
+     * @param null|Criteria $criteria
+     * @param string $sagaId
+     *
+     * @return State[]|\Generator
+     */
+    public function findBy($criteria, $sagaId);
+
+    /**
+     * @return State
+     */
+    public function generateNewState();
+}

From 5ab08b52e424f179f8841bf0bd26fafd836ad186 Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Fri, 20 Jan 2017 14:54:05 +0100
Subject: [PATCH 3/9] III-1804: Custom MultipleSagaManager.

---
 src/Broadway/Saga/MultipleSagaManager.php | 101 ++++++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 src/Broadway/Saga/MultipleSagaManager.php

diff --git a/src/Broadway/Saga/MultipleSagaManager.php b/src/Broadway/Saga/MultipleSagaManager.php
new file mode 100644
index 0000000..8a39398
--- /dev/null
+++ b/src/Broadway/Saga/MultipleSagaManager.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace CultuurNet\UDB3\UiTPASService\Broadway\Saga;
+
+use Broadway\Domain\DomainMessage;
+use Broadway\EventDispatcher\EventDispatcherInterface;
+use Broadway\Saga\Metadata\MetadataFactoryInterface;
+use Broadway\Saga\SagaInterface;
+use Broadway\Saga\SagaManagerInterface;
+use Broadway\Saga\State;
+use CultuurNet\UDB3\UiTPASService\Broadway\Saga\State\RepositoryInterface;
+use CultuurNet\UDB3\UiTPASService\Broadway\Saga\State\StateManagerInterface;
+
+/**
+ * SagaManager that manages multiple sagas with multiple states.
+ * Copied and adjusted from \Broadway\Saga\MultipleSagaManager.
+ */
+class MultipleSagaManager implements SagaManagerInterface
+{
+    private $repository;
+    private $sagas;
+    private $stateManager;
+    private $metadataFactory;
+    private $eventDispatcher;
+
+    /**
+     * @param RepositoryInterface $repository
+     * @param array $sagas
+     * @param StateManagerInterface $stateManager
+     * @param MetadataFactoryInterface $metadataFactory
+     * @param EventDispatcherInterface $eventDispatcher
+     */
+    public function __construct(
+        RepositoryInterface $repository,
+        array $sagas,
+        StateManagerInterface $stateManager,
+        MetadataFactoryInterface $metadataFactory,
+        EventDispatcherInterface $eventDispatcher
+    ) {
+        $this->repository      = $repository;
+        $this->sagas           = $sagas;
+        $this->stateManager    = $stateManager;
+        $this->metadataFactory = $metadataFactory;
+        $this->eventDispatcher = $eventDispatcher;
+    }
+
+    /**
+     * Handles the event by delegating it to Saga('s) related to the event.
+     * @param DomainMessage $domainMessage
+     */
+    public function handle(DomainMessage $domainMessage)
+    {
+        $event = $domainMessage->getPayload();
+
+        foreach ($this->sagas as $sagaType => $saga) {
+            $metadata = $this->metadataFactory->create($saga);
+
+            if (!$metadata->handles($event)) {
+                continue;
+            }
+
+            $criteria = $metadata->criteria($event);
+
+            if (is_null($criteria)) {
+                // If the saga returns null as criteria, it wants to handle the
+                // event with a new state.
+                $state = $this->stateManager->generateNewState();
+                $this->handleEventBySagaWithState($sagaType, $saga, $event, $state);
+            } else {
+                // If actual criteria are given, fetch all matching states and
+                // update them one by one.
+                foreach ($this->stateManager->findBy($criteria, $sagaType) as $state) {
+                    $this->handleEventBySagaWithState($sagaType, $saga, $event, $state);
+                }
+            }
+        }
+    }
+
+    /**
+     * @param string $sagaType
+     * @param SagaInterface $saga
+     * @param mixed $event
+     * @param State $state
+     */
+    private function handleEventBySagaWithState($sagaType, SagaInterface $saga, $event, State $state)
+    {
+        $this->eventDispatcher->dispatch(
+            SagaManagerInterface::EVENT_PRE_HANDLE,
+            [$sagaType, $state->getId()]
+        );
+
+        $newState = $saga->handle($event, $state);
+
+        $this->eventDispatcher->dispatch(
+            SagaManagerInterface::EVENT_POST_HANDLE,
+            [$sagaType, $state->getId()]
+        );
+
+        $this->repository->save($newState, $sagaType);
+    }
+}

From cc5857baabf070093b0ffc3002d63c7e81f2cfef Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Fri, 20 Jan 2017 14:56:49 +0100
Subject: [PATCH 4/9] III-1804: Bootstrapping of forked Saga classes.

---
 bootstrap.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bootstrap.php b/bootstrap.php
index 2afac3d..75cf750 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -4,8 +4,6 @@
 use Broadway\EventDispatcher\EventDispatcher;
 use Broadway\EventHandling\EventBusInterface;
 use Broadway\EventStore\DBALEventStore;
-use Broadway\Saga\MultipleSagaManager;
-use Broadway\Saga\State\MongoDBRepository;
 use Broadway\Serializer\SimpleInterfaceSerializer;
 use CommerceGuys\Intl\Currency\CurrencyRepository;
 use CommerceGuys\Intl\NumberFormat\NumberFormatRepository;
@@ -20,6 +18,9 @@
 use CultuurNet\UDB3\LabelCollection;
 use CultuurNet\UDB3\SimpleEventBus;
 use CultuurNet\UDB3\UiTPASService\Broadway\Saga\Metadata\StaticallyConfiguredSagaMetadataFactory;
+use CultuurNet\UDB3\UiTPASService\Broadway\Saga\MultipleSagaManager;
+use CultuurNet\UDB3\UiTPASService\Broadway\Saga\State\MongoDBRepository;
+use CultuurNet\UDB3\UiTPASService\Broadway\Saga\State\StateManager;
 use CultuurNet\UDB3\UiTPASService\OrganizerLabelReadRepository\JSONLDOrganizerLabelReadRepository;
 use CultuurNet\UDB3\UiTPASService\Permissions\DefaultEventPermission;
 use CultuurNet\UDB3\UiTPASService\Permissions\UDB3EventPermission;
@@ -469,7 +470,7 @@ function (Application $app) {
             [
                 'uitpas_sync' => $app['uitpas_event_saga'],
             ],
-            new \Broadway\Saga\State\StateManager(
+            new StateManager(
                 $app['saga_repository'],
                 new Broadway\UuidGenerator\Rfc4122\Version4Generator()
             ),

From 241838d294a90086602fdd20f6cbec8b2407a96e Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Fri, 20 Jan 2017 16:31:29 +0100
Subject: [PATCH 5/9] III-1804: Coding standard fix.

---
 src/Broadway/Saga/State/StateManager.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Broadway/Saga/State/StateManager.php b/src/Broadway/Saga/State/StateManager.php
index ce9eed6..3b425dc 100644
--- a/src/Broadway/Saga/State/StateManager.php
+++ b/src/Broadway/Saga/State/StateManager.php
@@ -34,7 +34,8 @@ public function findBy($criteria, $sagaId)
     /**
      * @return State
      */
-    public function generateNewState() {
+    public function generateNewState()
+    {
         return new State($this->generator->generate());
     }
 }

From 09009e510777dacb6cb05067db9e517168e9d3e2 Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Fri, 20 Jan 2017 17:01:29 +0100
Subject: [PATCH 6/9] III-1804: Updated UiTPASEventSagaTest to use forked
 broadway saga classes to have a more realistic unit test.

---
 .../Saga/State/InMemoryRepository.php         | 47 ++++++++++++
 src/Broadway/Saga/Testing/Scenario.php        | 75 +++++++++++++++++++
 tests/UiTPASEventSagaTest.php                 |  8 +-
 3 files changed, 126 insertions(+), 4 deletions(-)
 create mode 100644 src/Broadway/Saga/State/InMemoryRepository.php
 create mode 100644 src/Broadway/Saga/Testing/Scenario.php

diff --git a/src/Broadway/Saga/State/InMemoryRepository.php b/src/Broadway/Saga/State/InMemoryRepository.php
new file mode 100644
index 0000000..ced7eb1
--- /dev/null
+++ b/src/Broadway/Saga/State/InMemoryRepository.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace CultuurNet\UDB3\UiTPASService\Broadway\Saga\State;
+
+use Broadway\Saga\State;
+use Broadway\Saga\State\Criteria;
+
+class InMemoryRepository implements RepositoryInterface
+{
+    private $states = [];
+
+    /**
+     * {@inheritDoc}
+     */
+    public function findBy(Criteria $criteria, $sagaId)
+    {
+        if (!isset($this->states[$sagaId])) {
+            $states = [];
+        } else {
+            $states = $this->states[$sagaId];
+        }
+
+        foreach ($criteria->getComparisons() as $key => $value) {
+            $states = array_filter($states, function ($elem) use ($key, $value) {
+                $stateValue = $elem->get($key);
+
+                return is_array($stateValue) ? in_array($value, $stateValue) : $value === $stateValue;
+            });
+        }
+
+        foreach ($states as $state) {
+            yield $state;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function save(State $state, $sagaId)
+    {
+        if ($state->isDone()) {
+            unset($this->states[$sagaId][$state->getId()]);
+        } else {
+            $this->states[$sagaId][$state->getId()] = $state;
+        }
+    }
+}
diff --git a/src/Broadway/Saga/Testing/Scenario.php b/src/Broadway/Saga/Testing/Scenario.php
new file mode 100644
index 0000000..a17e9b3
--- /dev/null
+++ b/src/Broadway/Saga/Testing/Scenario.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace CultuurNet\UDB3\UiTPASService\Broadway\Saga\Testing;
+
+use Broadway\CommandHandling\Testing\TraceableCommandBus;
+use Broadway\Domain\DomainMessage;
+use Broadway\Domain\Metadata;
+use CultuurNet\UDB3\UiTPASService\Broadway\Saga\MultipleSagaManager;
+use PHPUnit_Framework_TestCase;
+
+class Scenario
+{
+    private $testCase;
+    private $sagaManager;
+    private $traceableCommandBus;
+    private $playhead;
+
+    public function __construct(
+        PHPUnit_Framework_TestCase $testCase,
+        MultipleSagaManager $sagaManager,
+        TraceableCommandBus $traceableCommandBus
+    ) {
+        $this->testCase            = $testCase;
+        $this->sagaManager         = $sagaManager;
+        $this->traceableCommandBus = $traceableCommandBus;
+        $this->playhead            = -1;
+    }
+
+    /**
+     * @param array $events
+     *
+     * @return Scenario
+     */
+    public function given(array $events = [])
+    {
+        foreach ($events as $given) {
+            $this->sagaManager->handle($this->createDomainMessageForEvent($given));
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param mixed $event
+     *
+     * @return Scenario
+     */
+    public function when($event)
+    {
+        $this->traceableCommandBus->record();
+
+        $this->sagaManager->handle($this->createDomainMessageForEvent($event));
+
+        return $this;
+    }
+
+    /**
+     * @param array $commands
+     *
+     * @return Scenario
+     */
+    public function then(array $commands)
+    {
+        $this->testCase->assertEquals($commands, $this->traceableCommandBus->getRecordedCommands());
+
+        return $this;
+    }
+
+    private function createDomainMessageForEvent($event)
+    {
+        $this->playhead++;
+
+        return DomainMessage::recordNow(1, $this->playhead, new Metadata([]), $event);
+    }
+}
diff --git a/tests/UiTPASEventSagaTest.php b/tests/UiTPASEventSagaTest.php
index 7775a89..6efcb3f 100644
--- a/tests/UiTPASEventSagaTest.php
+++ b/tests/UiTPASEventSagaTest.php
@@ -5,10 +5,6 @@
 use Broadway\CommandHandling\CommandBusInterface;
 use Broadway\CommandHandling\Testing\TraceableCommandBus;
 use Broadway\EventDispatcher\EventDispatcher;
-use Broadway\Saga\MultipleSagaManager;
-use Broadway\Saga\State\InMemoryRepository;
-use Broadway\Saga\State\StateManager;
-use Broadway\Saga\Testing\Scenario;
 use Broadway\UuidGenerator\Rfc4122\Version4Generator;
 use CommerceGuys\Intl\Currency\CurrencyRepository;
 use CommerceGuys\Intl\NumberFormat\NumberFormatRepository;
@@ -37,6 +33,10 @@
 use CultuurNet\UDB3\PriceInfo\Tariff;
 use CultuurNet\UDB3\Title;
 use CultuurNet\UDB3\UiTPASService\Broadway\Saga\Metadata\StaticallyConfiguredSagaMetadataFactory;
+use CultuurNet\UDB3\UiTPASService\Broadway\Saga\MultipleSagaManager;
+use CultuurNet\UDB3\UiTPASService\Broadway\Saga\State\InMemoryRepository;
+use CultuurNet\UDB3\UiTPASService\Broadway\Saga\State\StateManager;
+use CultuurNet\UDB3\UiTPASService\Broadway\Saga\Testing\Scenario;
 use CultuurNet\UDB3\UiTPASService\OrganizerLabelReadRepository\OrganizerLabelReadRepositoryInterface;
 use CultuurNet\UDB3\UiTPASService\Sync\Command\RegisterUiTPASEvent;
 use CultuurNet\UDB3\UiTPASService\Sync\Command\UpdateUiTPASEvent;

From 3cdddca71abeb495515ff8a34d22422b0e012372 Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Fri, 20 Jan 2017 17:09:00 +0100
Subject: [PATCH 7/9] III-1804: Added extra docblocks.

---
 .../Saga/Metadata/StaticallyConfiguredSagaMetadataFactory.php | 2 +-
 src/Broadway/Saga/State/InMemoryRepository.php                | 4 ++++
 src/Broadway/Saga/State/StateManager.php                      | 2 +-
 src/Broadway/Saga/Testing/Scenario.php                        | 4 ++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Broadway/Saga/Metadata/StaticallyConfiguredSagaMetadataFactory.php b/src/Broadway/Saga/Metadata/StaticallyConfiguredSagaMetadataFactory.php
index d105d18..1cd9891 100644
--- a/src/Broadway/Saga/Metadata/StaticallyConfiguredSagaMetadataFactory.php
+++ b/src/Broadway/Saga/Metadata/StaticallyConfiguredSagaMetadataFactory.php
@@ -7,7 +7,7 @@
 
 /**
  * Copied from Broadway\Saga\Metadata\StaticallyConfiguredSagaMetadataFactory
- * and modified to return an instance of Metadata.
+ * and modified to return an instance of the forked Metadata class.
  */
 class StaticallyConfiguredSagaMetadataFactory implements MetadataFactoryInterface
 {
diff --git a/src/Broadway/Saga/State/InMemoryRepository.php b/src/Broadway/Saga/State/InMemoryRepository.php
index ced7eb1..715df44 100644
--- a/src/Broadway/Saga/State/InMemoryRepository.php
+++ b/src/Broadway/Saga/State/InMemoryRepository.php
@@ -5,6 +5,10 @@
 use Broadway\Saga\State;
 use Broadway\Saga\State\Criteria;
 
+/**
+ * Copied from Broadway\Saga\State\InMemoryRepository and modified
+ * to use findBy() instead of findOneBy().
+ */
 class InMemoryRepository implements RepositoryInterface
 {
     private $states = [];
diff --git a/src/Broadway/Saga/State/StateManager.php b/src/Broadway/Saga/State/StateManager.php
index 3b425dc..4fbf6a0 100644
--- a/src/Broadway/Saga/State/StateManager.php
+++ b/src/Broadway/Saga/State/StateManager.php
@@ -7,7 +7,7 @@
 
 /**
  * Copied from Broadway\Saga\State\StateManager to use findBy() instead of
- * findOneBy(), and add generateNewState().
+ * findOneBy(), and added generateNewState().
  */
 class StateManager implements StateManagerInterface
 {
diff --git a/src/Broadway/Saga/Testing/Scenario.php b/src/Broadway/Saga/Testing/Scenario.php
index a17e9b3..c4dbf0c 100644
--- a/src/Broadway/Saga/Testing/Scenario.php
+++ b/src/Broadway/Saga/Testing/Scenario.php
@@ -8,6 +8,10 @@
 use CultuurNet\UDB3\UiTPASService\Broadway\Saga\MultipleSagaManager;
 use PHPUnit_Framework_TestCase;
 
+/**
+ * Copied from Broadway\Saga\Testing\Scenario and modified
+ * to use the forked MultipleSagaManager class.
+ */
 class Scenario
 {
     private $testCase;

From 55f2cf3138854163793dc05aa0bac946f4a65857 Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Fri, 20 Jan 2017 17:19:00 +0100
Subject: [PATCH 8/9] III-1804: Test that multiple events get pushed to uitpas
 when an uitpas label is added to their related organizer.

---
 tests/UiTPASEventSagaTest.php | 91 +++++++++++++++++++++++++----------
 1 file changed, 65 insertions(+), 26 deletions(-)

diff --git a/tests/UiTPASEventSagaTest.php b/tests/UiTPASEventSagaTest.php
index 6efcb3f..1971e6c 100644
--- a/tests/UiTPASEventSagaTest.php
+++ b/tests/UiTPASEventSagaTest.php
@@ -127,22 +127,7 @@ public function setUp()
 
         $this->eventId = 'e1122fff-0f67-4042-82c3-6b5ca7af02d7';
 
-        $this->eventCreated = new EventCreated(
-            $this->eventId,
-            new Title('title'),
-            new EventType('id', 'label'),
-            new Location(
-                '335be568-aaf0-4147-80b6-9267daafe23b',
-                new StringLiteral('Repeteerkot'),
-                new Address(
-                    new Street('Kerkstraat 69'),
-                    new PostalCode('9630'),
-                    new Locality('Zottegem'),
-                    Country::fromNative('BE')
-                )
-            ),
-            new Calendar(CalendarType::PERMANENT())
-        );
+        $this->eventCreated = $this->generateEventCreatedEvent($this->eventId);
 
         $this->regularOrganizerId = '72de67fb-d85c-4d3a-b464-b1157b83ed95';
         $this->uitpasOrganizerId = '6c1ac534-cd05-4ddb-a6d1-ba076aea9275';
@@ -837,16 +822,25 @@ public function it_ignores_cdbxml_and_udb2_events_with_invalid_cdbxml()
     /**
      * @test
      */
-    public function it_registers_an_uitpas_event_when_an_uitpas_label_is_added_to_the_organizer()
+    public function it_registers_multiple_uitpas_events_when_an_uitpas_label_is_added_to_their_related_organizer()
     {
         $organizerId = '750aaaab-e25b-4654-85f5-b5386279d48b';
 
+        $event1Id = '707cdc16-746f-4bde-8440-6d0134d96e95';
+        $event2Id = '03297490-6cd2-49a5-84b9-207e65616b8c';
+
+        $eventCreated1 = $this->generateEventCreatedEvent($event1Id);
+        $eventCreated2 = $this->generateEventCreatedEvent($event2Id);
+
         $this->scenario
             ->given(
                 [
-                    $this->eventCreated,
-                    new OrganizerUpdated($this->eventId, $organizerId),
-                    new PriceInfoUpdated($this->eventId, $this->priceInfo),
+                    $eventCreated1,
+                    new OrganizerUpdated($event1Id, $organizerId),
+                    new PriceInfoUpdated($event1Id, $this->priceInfo),
+                    $eventCreated2,
+                    new OrganizerUpdated($event2Id, $organizerId),
+                    new PriceInfoUpdated($event2Id, $this->priceInfo),
                 ]
             )
             ->when(
@@ -854,9 +848,16 @@ public function it_registers_an_uitpas_event_when_an_uitpas_label_is_added_to_th
             )
             ->then(
                 [
-                    new CreateUiTPASAggregate($this->eventId, []),
+                    new CreateUiTPASAggregate($event1Id, []),
                     new RegisterUiTPASEvent(
-                        $this->eventId,
+                        $event1Id,
+                        $organizerId,
+                        $this->priceInfo,
+                        []
+                    ),
+                    new CreateUiTPASAggregate($event2Id, []),
+                    new RegisterUiTPASEvent(
+                        $event2Id,
                         $organizerId,
                         $this->priceInfo,
                         []
@@ -864,18 +865,32 @@ public function it_registers_an_uitpas_event_when_an_uitpas_label_is_added_to_th
                 ]
             );
 
-        $expectedLogContext = [
+        $expectedLogContext1 = [
             'organizer' => $organizerId,
             'label' => 'UiTPAS Mechelen',
-            'event' => $this->eventId,
+            'event' => $event1Id,
+            'uitpas_labels' => ['UiTPAS Gent', 'UiTPAS Mechelen'],
+        ];
+
+        $expectedLogContext2 = [
+            'organizer' => $organizerId,
+            'label' => 'UiTPAS Mechelen',
+            'event' => $event2Id,
             'uitpas_labels' => ['UiTPAS Gent', 'UiTPAS Mechelen'],
         ];
 
         $this->assertLogged(
             Logger::DEBUG,
             'uitpas label was added to organizer',
-            $expectedLogContext,
-            1
+            $expectedLogContext1,
+            2
+        );
+
+        $this->assertLogged(
+            Logger::DEBUG,
+            'uitpas label was added to organizer',
+            $expectedLogContext2,
+            3
         );
     }
 
@@ -914,6 +929,30 @@ public function it_does_not_register_an_uitpas_event_when_a_label_not_relevant_f
         );
     }
 
+    /**
+     * @param string $eventId
+     * @return EventCreated
+     */
+    private function generateEventCreatedEvent($eventId)
+    {
+        return new EventCreated(
+            $eventId,
+            new Title('title'),
+            new EventType('id', 'label'),
+            new Location(
+                '335be568-aaf0-4147-80b6-9267daafe23b',
+                new StringLiteral('Repeteerkot'),
+                new Address(
+                    new Street('Kerkstraat 69'),
+                    new PostalCode('9630'),
+                    new Locality('Zottegem'),
+                    Country::fromNative('BE')
+                )
+            ),
+            new Calendar(CalendarType::PERMANENT())
+        );
+    }
+
     /**
      * @param int $level
      * @param string $message

From 7a79ad35e720cc17b62f05541200e35f803fa10f Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Fri, 20 Jan 2017 17:20:51 +0100
Subject: [PATCH 9/9] III-1804: Coding standards in copied InMemoryRepository.

---
 src/Broadway/Saga/State/InMemoryRepository.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Broadway/Saga/State/InMemoryRepository.php b/src/Broadway/Saga/State/InMemoryRepository.php
index 715df44..ac0dcad 100644
--- a/src/Broadway/Saga/State/InMemoryRepository.php
+++ b/src/Broadway/Saga/State/InMemoryRepository.php
@@ -25,11 +25,13 @@ public function findBy(Criteria $criteria, $sagaId)
         }
 
         foreach ($criteria->getComparisons() as $key => $value) {
-            $states = array_filter($states, function ($elem) use ($key, $value) {
-                $stateValue = $elem->get($key);
-
-                return is_array($stateValue) ? in_array($value, $stateValue) : $value === $stateValue;
-            });
+            $states = array_filter(
+                $states,
+                function ($elem) use ($key, $value) {
+                    $stateValue = $elem->get($key);
+                    return is_array($stateValue) ? in_array($value, $stateValue) : $value === $stateValue;
+                }
+            );
         }
 
         foreach ($states as $state) {