Fix sync handlers

README.md

@@ -175,8 +175,12 @@ Each handler is constructed with the `event` (name of the webhook event) and `da
 
 namespace App\Http\Handlers\Stripe;
 
+use Illuminate\Foundation\Bus\Dispatchable;
+
 class CustomerCreated
 {
+    use Dispatchable;
+
     public function __construct(public string $event, public array $data)
     {
     }

src/Providers/AbstractProvider.php

@@ -3,7 +3,6 @@
 namespace Receiver\Providers;
 
 use Closure;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Contracts\Support\Responsable;
 use Illuminate\Foundation\Bus\PendingDispatch;
 use Illuminate\Http\JsonResponse;
@@ -102,7 +101,7 @@ public function receive(Request $request): static
      */
     public function ok(): JsonResponse|Response
     {
-        if (! $this->dispatched && $this->fallback) {
+        if (! $this->dispatched() && $this->fallback) {
             $callback = $this->fallback;
 
             $callback($this->webhook);
@@ -139,6 +138,14 @@ public function webhook(): ?Webhook
         return $this->webhook;
     }
 
+    /**
+     * @return PendingDispatch|null
+     */
+    public function dispatched(): ?PendingDispatch
+    {
+        return $this->dispatched;
+    }
+
     /**
      * @param Request $request
      * @return Webhook
@@ -152,19 +159,19 @@ protected function mapWebhook(Request $request): Webhook
     }
 
     /**
-     * @return void
+     * @return AbstractProvider
      */
-    protected function handle(): void
+    protected function handle(): static
     {
         $class = $this->getClass($event = $this->webhook->getEvent());
 
         if (class_exists($class)) {
             $instance = new $class($event, $this->webhook->getData(), $this->webhook);
 
-            $this->dispatched = $instance instanceof ShouldQueue
-                ? dispatch($instance)
-                : dispatch_sync($instance);
+            $this->dispatched = dispatch($instance);
         }
+
+        return $this;
     }
 
     /**

stubs/receiver-verified.stub

@@ -2,11 +2,14 @@
 
 namespace {{ providerNamespace }};
 
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Http\Request;
 use Receiver\Providers\AbstractProvider;
 
 class {{ providerClass }} extends AbstractProvider
 {
+    use Dispatchable;
+
     /**
      * @param Request $request
      * @return bool

stubs/receiver.stub

@@ -2,11 +2,14 @@
 
 namespace {{ providerNamespace }};
 
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Http\Request;
 use Receiver\Providers\AbstractProvider;
 
 class {{ providerClass }} extends AbstractProvider
 {
+    use Dispatchable;
+
     /**
      * @param Request $request
      * @return string

tests/Fixtures/FooBarred.php

@@ -2,8 +2,12 @@
 
 namespace Receiver\Tests\Fixtures;
 
+use Illuminate\Foundation\Bus\Dispatchable;
+
 class FooBarred
 {
+    use Dispatchable;
+
     public function __construct(public string $event, public array $data)
     {
     }

tests/ProviderTest.php

@@ -15,7 +15,8 @@ public function test_handles_webhook_with_existing_handler()
 
         $provider = new TestProvider();
 
-        $response = $provider->receive($request)
+        $response = $provider
+            ->receive($request)
             ->fallback(fn (Webhook $webhook) => throw new \Exception('Fallback!'))
             ->ok();
 
@@ -33,7 +34,8 @@ public function test_handles_webhook_with_missing_handler()
 
         $provider = new TestProvider();
 
-        $response = $provider->receive($request)
+        $response = $provider
+            ->receive($request)
             ->fallback(fn (Webhook $webhook) => throw new \Exception('Fallback!'))
             ->ok();