ECS-310

Author: MsNatali

config/config.php

@@ -11,5 +11,6 @@
         'username' => env('ELASTICSEARCH_USERNAME', ''),
         'password' => env('ELASTICSEARCH_PASSWORD', ''),
         'ssl_verification' => env('ELASTICSEARCH_SSL_VERIFICATION', false),
+        'handler' => null, // for call_user_func_array
     ],
 ];

src/ElasticClient.php

@@ -144,7 +144,7 @@ public function getQueryLog(): Collection
         return $this->queryLog?->all() ?? new Collection();
     }
 
-    public static function fromConfig(array $config, mixed $handler = null): static
+    public static function fromConfig(array $config): static
     {
         $builder = (new ClientBuilder())
             ->setHosts($config['hosts'])
@@ -157,8 +157,8 @@ public static function fromConfig(array $config, mixed $handler = null): static
             $builder->setBasicAuthentication($username, $password);
         }
 
-        if (!is_null($handler)) {
-            $builder->setHandler($handler);
+        if (filled($config['handler'] ?? null)) {
+            $builder->setHandler(call_user_func_array($config['handler'], []));
         }
 
         return new static($builder->build());

src/ElasticQueryServiceProvider.php

@@ -29,12 +29,7 @@ public function register(): void
 
         $this->app->singleton(
             ElasticClient::class,
-            fn (Application $app) => ElasticClient::fromConfig($app['config']['laravel-elastic-query.connection'], $this->getElasticClientHandler())
+            fn (Application $app) => ElasticClient::fromConfig($app['config']['laravel-elastic-query.connection'])
         );
     }
-
-    protected function getElasticClientHandler(): ?callable
-    {
-        return null;
-    }
 }