Merge pull request #178 from prooph/finalize_guard

fix FinalizeGuard
prooph · Dec 26, 2017 · fd83b41 · fd83b41
2 parents c239acf + 9c1f69d
commit fd83b41
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Plugin/Guard/FinalizeGuard.php b/src/Plugin/Guard/FinalizeGuard.php
@@ -45,7 +45,7 @@ function (ActionEvent $actionEvent): void {
                 $messageName = $actionEvent->getParam(MessageBus::EVENT_PARAM_MESSAGE_NAME);
 
                 if ($promise instanceof Promise) {
-                    $newPromise = $promise->then(function ($result) use ($actionEvent, $messageName): void {
+                    $newPromise = $promise->then(function ($result) use ($actionEvent, $messageName) {
                         if (! $this->authorizationService->isGranted($messageName, $result)) {
                             $actionEvent->stopPropagation(true);
 
@@ -55,8 +55,9 @@ function (ActionEvent $actionEvent): void {
 
                             throw new UnauthorizedException($messageName);
                         }
-                    });
 
+                        return $result;
+                    });
                     $actionEvent->setParam(QueryBus::EVENT_PARAM_PROMISE, $newPromise);
                 } elseif (! $this->authorizationService->isGranted($messageName)) {
                     $actionEvent->stopPropagation(true);

diff --git a/tests/Plugin/Guard/FinalizeGuardTest.php b/tests/Plugin/Guard/FinalizeGuardTest.php
@@ -72,7 +72,10 @@ function (ActionEvent $actionEvent): void {
         );
 
         $promise = $this->messageBus->dispatch('test_event');
-        $promise->done();
+        $promise->done(function ($result) {
+            $this->assertNotNull($result);
+            $this->assertEquals('result', $result);
+        });
     }
 
     /**