fast-ext for disabled event listener

Author: limenet

phpstan-baseline.neon

@@ -6,16 +6,21 @@ parameters:
 			path: src/Commands/IndexCommand.php
 
 		-
-			message: "#^Call to an undefined method Illuminate\\\\Database\\\\Eloquent\\\\Model\\|Limenet\\\\LaravelElasticaBridge\\\\Model\\\\ElasticsearchableInterface\\:\\:getElasticsearchId\\(\\)\\.$#"
+			message: "#^Unable to resolve the template type TKey in call to function collect$#"
 			count: 1
-			path: src/Index/AbstractIndex.php
+			path: src/Events/EventHandler.php
 
 		-
-			message: "#^Parameter \\#2 \\$listener of static method Illuminate\\\\Events\\\\Dispatcher\\:\\:listen\\(\\) expects array\\|Closure\\|string\\|null, Illuminate\\\\Events\\\\QueuedClosure given\\.$#"
+			message: "#^Unable to resolve the template type TValue in call to function collect$#"
 			count: 1
-			path: src/LaravelElasticaBridgeServiceProvider.php
+			path: src/Events/EventHandler.php
+
+		-
+			message: "#^Call to an undefined method Illuminate\\\\Database\\\\Eloquent\\\\Model\\|Limenet\\\\LaravelElasticaBridge\\\\Model\\\\ElasticsearchableInterface\\:\\:getElasticsearchId\\(\\)\\.$#"
+			count: 1
+			path: src/Index/AbstractIndex.php
 
 		-
-			message: "#^Parameter \\#2 \\$model of method Limenet\\\\LaravelElasticaBridge\\\\Services\\\\ModelEventListener\\:\\:handle\\(\\) expects Illuminate\\\\Database\\\\Eloquent\\\\Model&Limenet\\\\LaravelElasticaBridge\\\\Model\\\\ElasticsearchableInterface, Illuminate\\\\Database\\\\Eloquent\\\\Model given\\.$#"
+			message: "#^Cannot access offset 'events' on Illuminate\\\\Contracts\\\\Foundation\\\\Application\\.$#"
 			count: 1
 			path: src/LaravelElasticaBridgeServiceProvider.php

src/Events/EventHandler.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Limenet\LaravelElasticaBridge\Events;
+
+use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Database\Eloquent\Model;
+use Limenet\LaravelElasticaBridge\Client\ElasticaClient;
+use Limenet\LaravelElasticaBridge\Services\ModelEventListener;
+
+class EventHandler
+{
+    public function __construct(
+        private ElasticaClient $elasticaClient,
+        private ModelEventListener $modelEventListener
+    ) {
+    }
+
+    public function subscribe(Dispatcher $events): void
+    {
+        $events->listen(
+            collect(ModelEventListener::EVENTS)
+                ->map(fn (string $name): string => sprintf('eloquent.%s:*', $name))
+                ->toArray(),
+            function ($event, $models) {
+                if (! $this->elasticaClient->listensToEvents()) {
+                    return;
+                }
+
+                dispatch(function () use ($event, $models): void {
+                    $name = (str($event)->before(':')->after('.'));
+                    if (! $this->elasticaClient->listensToEvents()) {
+                        return;
+                    }
+
+                    collect($models)->each(fn (Model $model) => $this->modelEventListener->handle($name, $model));
+                })->onConnection(config('elastica-bridge.connection'));
+            });
+    }
+}

src/LaravelElasticaBridgeServiceProvider.php

@@ -4,12 +4,10 @@
 
 namespace Limenet\LaravelElasticaBridge;
 
-use Illuminate\Database\Eloquent\Model;
-use function Illuminate\Events\queueable;
-use Illuminate\Support\Facades\Event;
 use Limenet\LaravelElasticaBridge\Client\ElasticaClient;
 use Limenet\LaravelElasticaBridge\Commands\IndexCommand;
 use Limenet\LaravelElasticaBridge\Commands\StatusCommand;
+use Limenet\LaravelElasticaBridge\Events\EventHandler;
 use Limenet\LaravelElasticaBridge\Repository\IndexRepository;
 use Limenet\LaravelElasticaBridge\Services\ModelEventListener;
 use Spatie\LaravelPackageTools\Package;
@@ -39,22 +37,7 @@ public function packageRegistered(): void
         $this->app->when(IndexRepository::class)
                 ->needs('$indices')
                 ->giveTagged('elasticaBridgeIndices');
-    }
-
-    public function packageBooted(): void
-    {
-        foreach (ModelEventListener::EVENTS as $name) {
-            Event::listen(
-                sprintf('eloquent.%s:*', $name),
-                queueable(function (string $event, array $models) use ($name): void {
-                    if (! resolve(ElasticaClient::class)->listensToEvents()) {
-                        return;
-                    }
 
-                    $modelEventListener = resolve(ModelEventListener::class);
-                    collect($models)->each(fn (Model $model) => $modelEventListener->handle($name, $model));
-                })->onConnection(config('elastica-bridge.connection'))
-            );
-        }
+        $this->app['events']->subscribe(EventHandler::class);
     }
 }

src/Services/ModelEventListener.php

@@ -12,15 +12,15 @@
 
 class ModelEventListener
 {
-    public const EVENT_CREATED = 'created';
+    private const EVENT_CREATED = 'created';
 
-    public const EVENT_UPDATED = 'updated';
+    private const EVENT_UPDATED = 'updated';
 
-    public const EVENT_SAVED = 'saved';
+    private const EVENT_SAVED = 'saved';
 
-    public const EVENT_RESTORED = 'restored';
+    private const EVENT_RESTORED = 'restored';
 
-    public const EVENT_DELETED = 'deleted';
+    private const EVENT_DELETED = 'deleted';
 
     public const EVENTS = [
         self::EVENT_CREATED,
@@ -34,9 +34,13 @@ public function __construct(protected IndexRepository $indexRepository)
     {
     }
 
-    /** @param  ElasticsearchableInterface&Model  $model */
+    /** @param  Model  $model */
     public function handle(string $event, Model $model): void
     {
+        if (! $model instanceof ElasticsearchableInterface) {
+            return;
+        }
+
         foreach ($this->matchingIndicesForElement($model) as $index) {
             if (! $index->getElasticaIndex()->exists()) {
                 continue;