Always pass context as argument, even if null

event-engine · Aug 29, 2019 · dc79f85 · dc79f85
1 parent 07b994f
commit dc79f85
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/Commanding/CommandProcessor.php b/src/Commanding/CommandProcessor.php
@@ -234,7 +234,6 @@ public function __invoke(Message $command): array
 
         $aggregate = null;
         $aggregateState = null;
-        $context = null;
         $expectedVersion = $command->metadata()[GenericCommand::META_EXPECTED_AGGREGATE_VERSION] ?? null;
 
         if ($this->createAggregate) {
@@ -250,18 +249,17 @@ public function __invoke(Message $command): array
             $aggregateState = $aggregate->currentState();
         }
 
+        $services = $this->services;
+
         if ($this->contextProvider) {
             $context = $this->flavour->callContextProvider($this->contextProvider, $command);
             $this->log->contextProviderCalled($this->contextProvider, $command, $context);
-        }
-
-        $arFunc = $this->aggregateFunction;
-        $services = $this->services;
 
-        if($context !== null) {
             \array_unshift($services, $context);
         }
 
+        $arFunc = $this->aggregateFunction;
+
         if ($this->createAggregate) {
             $events = $this->flavour->callAggregateFactory($this->aggregateType, $arFunc, $command, ...$services);
         } else {