skip dispatching empty array with webhooks into queue

Author: Triplkrypl

.github/README.md

@@ -293,8 +293,8 @@ catch (\Throwable $exception) {
 
 ### Api server webhook tools
 
-For webhook dispatching from server site to a client is here prepared Dispatcher.
-Dispatcher will find necessary webhooks for calling by using abstract webhook [Repository](../src/Service/Webhook/Repository.php)
+For webhook dispatching from server site to a client is here prepared WebhookDispatcher.
+WebhookDispatcher will find necessary webhooks for calling by using abstract webhook [Repository](../src/Service/Webhook/Repository.php)
 and after then call them by abstract webhook [Client](../src/Service/Webhook/Client.php).
 
 You need to implement webhook Repository, webhook Client and have prepared
@@ -324,7 +324,7 @@ php artisan vendor:publish --tag=api-toolkit-migration
  * @var \SimpleAsFuck\ApiToolkit\Service\Webhook\Client $webhookClient
  */
 
-$dispatcher = new \SimpleAsFuck\ApiToolkit\Service\Webhook\Dispatcher($webhookRepository, $webhookClient);
+$dispatcher = new \SimpleAsFuck\ApiToolkit\Service\Webhook\WebhookDispatcher($webhookRepository, $webhookClient);
 
 // simplest dispatch, when something happened on the server side,
 // webhooks calls are added into a queue

src/Service/Webhook/LaravelMysqlRepository.php

@@ -23,7 +23,7 @@ public function __construct(
     /**
      * @param non-empty-string $type
      * @param array<non-empty-string, non-empty-string> $attributes
-     * @return iterable<Webhook>
+     * @return iterable<Webhook>&\Countable
      */
     public function loadForDispatching(string $type, array $attributes): iterable
     {
@@ -68,7 +68,7 @@ public function loadForDispatching(string $type, array $attributes): iterable
             return $diff;
         });
 
-        return $webhooks;
+        return new \ArrayIterator($webhooks);
     }
 
     /**

src/Service/Webhook/Repository.php

@@ -26,7 +26,7 @@ abstract class Repository
      *
      * @param non-empty-string $type
      * @param array<non-empty-string, non-empty-string> $attributes with webhook will be dispatched
-     * @return iterable<Webhook>
+     * @return iterable<Webhook>&\Countable
      */
     abstract public function loadForDispatching(string $type, array $attributes): iterable;
 

src/Service/Webhook/Dispatcher.php src/Service/Webhook/WebhookDispatcher.phpsrc/Service/Webhook/Dispatcher.php renamed to src/Service/Webhook/WebhookDispatcher.php

@@ -6,7 +6,7 @@
 
 use GuzzleHttp\RequestOptions;
 
-class Dispatcher
+class WebhookDispatcher
 {
     public function __construct(
         private Repository $repository,
@@ -20,9 +20,12 @@ public function __construct(
      * @param array<non-empty-string, string|array<string>> $headers to apply for http request
      * @param array<RequestOptions::*, mixed> $options to apply for http request
      */
-    public function dispatch(string $type, array $attributes, bool $synchronouslyFirstTry = false, array $headers = [], array $options = []): void
+    public function dispatch(string $type, array $attributes = [], bool $synchronouslyFirstTry = false, array $headers = [], array $options = []): void
     {
         $webhooks = $this->repository->loadForDispatching($type, $attributes);
+        if (count($webhooks) === 0) {
+            return;
+        }
 
         if ($synchronouslyFirstTry) {
             $this->client->callWebhooks($webhooks, 0, $headers, $options);
@@ -33,15 +36,18 @@ public function dispatch(string $type, array $attributes, bool $synchronouslyFir
     }
 
     /**
+     * @param positive-int $delayInSeconds
      * @param non-empty-string $type
      * @param array<non-empty-string, non-empty-string> $attributes
-     * @param positive-int $delayInSeconds
      * @param array<non-empty-string, string|array<string>> $headers to apply on http requests
      * @param array<RequestOptions::*, mixed> $options to apply on http requests
      */
-    public function dispatchWithDelay(string $type, array $attributes, int $delayInSeconds, array $headers = [], array $options = []): void
+    public function dispatchWithDelay(int $delayInSeconds, string $type, array $attributes = [], array $headers = [], array $options = []): void
     {
         $webhooks = $this->repository->loadForDispatching($type, $attributes);
+        if (count($webhooks) === 0) {
+            return;
+        }
 
         $this->client->dispatchWebhooks($webhooks, $delayInSeconds, 0, $headers, $options);
     }