Always defer execution

Author: Anton Shabouta

src/Processor.php

@@ -13,8 +13,8 @@
 namespace PHPinnacle\Ensign;
 
 use Amp;
+use Amp\Deferred;
 use Amp\Promise;
-use Amp\Success;
 
 final class Processor
 {
@@ -67,14 +67,22 @@ public function interrupt(string $interrupt, callable $handler): void
      */
     public function execute(callable $handler, array $arguments): Promise
     {
-        return Amp\call(function () use ($handler, $arguments) {
-            $result = $this->executor->execute($handler, $arguments);
+        $deferred = new Deferred;
 
-            if ($result instanceof \Generator) {
-                return new Subroutine($result, $this->resolver);
-            }
+        Amp\Loop::defer(function () use ($deferred, $handler, $arguments) {
+            try {
+                $result = $this->executor->execute($handler, $arguments);
+
+                if ($result instanceof \Generator) {
+                    $result = new Subroutine($result, $this->resolver);
+                }
 
-            return $result;
+                $deferred->resolve($result);
+            } catch (\Throwable $error) {
+                $deferred->fail($error);
+            }
         });
+
+        return $deferred->promise();
     }
 }