#105512 Рефакторинг тестов

Author: zix2

composer.json

@@ -43,7 +43,10 @@
 
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "php-http/discovery": false
+        }
     },
     "extra": {
         "laravel": {

tests/Seeds/IndexSeeder.php

@@ -2,7 +2,7 @@
 
 namespace Ensi\LaravelElasticQuery\Tests\Seeds;
 
-use Elasticsearch\Client;
+use Ensi\LaravelElasticQuery\ElasticClient;
 
 abstract class IndexSeeder
 {
@@ -13,14 +13,14 @@ abstract class IndexSeeder
 
     protected bool $recreate;
 
-    protected ?Client $client;
+    protected ?ElasticClient $client;
 
     public function __construct()
     {
         $this->recreate = config('tests.recreate_index', true);
     }
 
-    public function setClient(Client $client): void
+    public function setClient(ElasticClient $client): void
     {
         $this->client = $client;
     }
@@ -49,31 +49,27 @@ public function call(): void
 
     protected function isIndexExists(): bool
     {
-        return $this->client->indices()->exists(['index' => $this->indexName]);
+        return $this->client->indicesExists($this->indexName);
     }
 
     protected function dropIndex(): void
     {
-        $this->client
-            ->indices()
-            ->delete(['index' => $this->indexName]);
+        $this->client->indicesDelete($this->indexName);
     }
 
     protected function createIndex(): void
     {
-        $params = ['index' => $this->indexName];
+        $settings = [];
 
         if (!empty($this->mappings)) {
-            data_set($params, 'body.mappings', $this->mappings);
+            $settings['mappings'] = $this->mappings;
         }
 
         if (!empty($this->settings)) {
-            data_set($params, 'body.settings', $this->settings);
+            $settings['settings'] = $this->settings;
         }
 
-        $this->client
-            ->indices()
-            ->create($params);
+        $this->client->indicesCreate($this->indexName, $settings);
     }
 
     protected function loadFixtures(): void
@@ -87,7 +83,7 @@ protected function loadFixtures(): void
             );
 
         if ($hasChanges) {
-            $this->client->indices()->refresh(['index' => $this->indexName]);
+            $this->client->indicesRefresh($this->indexName);
         }
     }
 
@@ -103,7 +99,7 @@ protected function loadFixture(string $path): bool
             ->flatMap(fn (array $document, int $index) => $this->documentToCommand($document, $index))
             ->toArray();
 
-        $this->client->bulk(['body' => $body]);
+        $this->client->bulk($this->indexName, $body);
 
         return true;
     }

tests/Seeds/SeedRunner.php

@@ -2,16 +2,15 @@
 
 namespace Ensi\LaravelElasticQuery\Tests\Seeds;
 
-use Elasticsearch\Client;
-use Elasticsearch\ClientBuilder;
+use Ensi\LaravelElasticQuery\ElasticClient;
 
 class SeedRunner
 {
     private static ?self $instance;
 
     private array $processed = [];
 
-    protected function __construct(private Client $client)
+    protected function __construct(private ElasticClient $client)
     {
     }
 
@@ -38,9 +37,7 @@ public static function getInstance(): self
 
     private static function createInstance(): self
     {
-        $client = ClientBuilder::create()
-            ->setHosts(config('laravel-elastic-query.connection.hosts'))
-            ->build();
+        $client = ElasticClient::fromConfig(config('laravel-elastic-query.connection'));
 
         return new self($client);
     }