Remove Laravel support dependency

Author: stevebauman

README.md

@@ -74,11 +74,11 @@ Documents contain the OpenSearch document ID and source payload:
 ```php
 use DirectoryTree\OpenSearchAdapter\Documents\Document;
 
-$documents->index('books', collect([
+$documents->index('books', [
     new Document('1', [
         'title' => 'The Hobbit',
     ]),
-]));
+]);
 ```
 
 Routing values can be attached by document ID:
@@ -88,11 +88,11 @@ use DirectoryTree\OpenSearchAdapter\Documents\Routing;
 
 $routing = (new Routing)->add('1', 'tenant-1');
 
-$documents->index('books', collect([
+$documents->index('books', [
     new Document('1', [
         'title' => 'The Hobbit',
     ]),
-]), routing: $routing);
+], routing: $routing);
 ```
 
 ## Searching Documents
@@ -118,9 +118,10 @@ $response = $documents->search('books', $request);
 
 $total = $response->total();
 
-$hits = $response->hits()->map(function ($hit) {
-    return $hit->document()->content();
-});
+$hits = array_map(
+    fn ($hit) => $hit->document()->content(),
+    $response->hits(),
+);
 ```
 
 ## Aliases
@@ -148,6 +149,6 @@ $aliases = $indices->getAliases('books');
 Search response objects expose the original OpenSearch payload through `raw()`:
 
 ```php
-$rawHit = $response->hits()->first()->raw();
+$rawHit = $response->hits()[0]->raw();
 $rawResponse = $response->raw();
 ```

composer.json

@@ -28,7 +28,6 @@
     "require": {
         "php": "^8.2",
         "guzzlehttp/guzzle": "^7.0",
-        "illuminate/support": "^11.0|^12.0|^13.0",
         "opensearch-project/opensearch-php": "^2.6"
     },
     "require-dev": {

src/Documents/Document.php

@@ -2,10 +2,7 @@
 
 namespace DirectoryTree\OpenSearchAdapter\Documents;
 
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Support\Arr;
-
-class Document implements Arrayable
+class Document
 {
     /**
      * Create a new document instance.
@@ -39,7 +36,11 @@ public function id(): string
      */
     public function content(?string $key = null): mixed
     {
-        return Arr::get($this->content, $key);
+        if ($key === null) {
+            return $this->content;
+        }
+
+        return $this->content[$key] ?? null;
     }
 
     /**

src/Documents/DocumentManager.php

@@ -5,7 +5,6 @@
 use DirectoryTree\OpenSearchAdapter\Exceptions\BulkRequestException;
 use DirectoryTree\OpenSearchAdapter\Search\SearchRequest;
 use DirectoryTree\OpenSearchAdapter\Search\SearchResponse;
-use Illuminate\Support\Collection;
 use OpenSearch\Client;
 
 class DocumentManager
@@ -23,13 +22,13 @@ public function __construct(
     /**
      * Index the given documents into OpenSearch.
      *
-     * @param  Collection<int, Document>  $documents
+     * @param  array<int, Document>  $documents
      *
      * @throws BulkRequestException
      */
     public function index(
         string $indexName,
-        Collection $documents,
+        array $documents,
         bool $refresh = false,
         ?Routing $routing = null
     ): self {

src/Indices/IndexManager.php

@@ -2,7 +2,6 @@
 
 namespace DirectoryTree\OpenSearchAdapter\Indices;
 
-use Illuminate\Support\Collection;
 use OpenSearch\Client;
 use OpenSearch\Namespaces\IndicesNamespace;
 
@@ -180,23 +179,26 @@ public function drop(string $indexName): self
     /**
      * Get the aliases for the given index.
      *
-     * @return Collection<string, Alias>
+     * @return array<string, Alias>
      */
-    public function getAliases(string $indexName): Collection
+    public function getAliases(string $indexName): array
     {
         $response = $this->indices->getAlias([
             'index' => $indexName,
         ]);
 
         $aliases = $response[$indexName]['aliases'] ?? [];
+        $results = [];
 
-        return collect($aliases)->map(static function (array $parameters, string $name) {
-            return new Alias(
+        foreach ($aliases as $name => $parameters) {
+            $results[$name] = new Alias(
                 $name,
                 $parameters['filter'] ?? null,
                 $parameters['routing'] ?? null
             );
-        });
+        }
+
+        return $results;
     }
 
     /**

src/Indices/Mapping.php

@@ -3,8 +3,6 @@
 namespace DirectoryTree\OpenSearchAdapter\Indices;
 
 use Closure;
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Support\Traits\ForwardsCalls;
 
 /**
  * @method $this alias(string $name, array|null $parameters = null)
@@ -48,10 +46,8 @@
  * @method $this tokenCount(string $name, array|null $parameters = null)
  * @method $this wildcard(string $name, array|null $parameters = null)
  */
-class Mapping implements Arrayable
+class Mapping
 {
-    use ForwardsCalls;
-
     /**
      * Indicates if OpenSearch should index field names.
      */
@@ -141,7 +137,7 @@ public function dynamicTemplate(string $name, array $parameters): self
      */
     public function __call(string $method, array $parameters): self
     {
-        $this->forwardCallTo($this->properties, $method, $parameters);
+        $this->properties->{$method}(...$parameters);
 
         return $this;
     }

src/Indices/MappingProperties.php

@@ -4,8 +4,6 @@
 
 use BadMethodCallException;
 use Closure;
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Support\Str;
 
 /**
  * @method $this alias(string $name, array|null $parameters = null)
@@ -47,7 +45,7 @@
  * @method $this tokenCount(string $name, array|null $parameters = null)
  * @method $this wildcard(string $name, array|null $parameters = null)
  */
-class MappingProperties implements Arrayable
+class MappingProperties
 {
     /**
      * The property definitions.
@@ -101,7 +99,7 @@ public function __call(string $method, array $arguments): self
             throw new BadMethodCallException(sprintf('Invalid number of arguments for %s method', $method));
         }
 
-        $property = ['type' => Str::snake($method)];
+        $property = ['type' => $this->snake($method)];
 
         if (isset($arguments[1])) {
             $property += $arguments[1];
@@ -140,4 +138,12 @@ protected function normalizeParametersWithProperties(Closure|array $parameters):
 
         return $parameters;
     }
+
+    /**
+     * Convert a camel-case field type into an OpenSearch snake-case type.
+     */
+    protected function snake(string $value): string
+    {
+        return strtolower((string) preg_replace('/(?<!^)[A-Z]/', '_$0', $value));
+    }
 }

src/Indices/Settings.php

@@ -3,14 +3,12 @@
 namespace DirectoryTree\OpenSearchAdapter\Indices;
 
 use BadMethodCallException;
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Support\Str;
 
 /**
  * @method $this index(array $configuration)
  * @method $this analysis(array $configuration)
  */
-class Settings implements Arrayable
+class Settings
 {
     /**
      * The index settings payload.
@@ -32,7 +30,7 @@ public function __call(string $method, array $arguments): self
             throw new BadMethodCallException(sprintf('Invalid number of arguments for %s method', $method));
         }
 
-        $this->settings[Str::snake($method)] = $arguments[0];
+        $this->settings[$this->snake($method)] = $arguments[0];
 
         return $this;
     }
@@ -46,4 +44,12 @@ public function toArray(): array
     {
         return $this->settings;
     }
+
+    /**
+     * Convert a camel-case settings group into snake case.
+     */
+    protected function snake(string $value): string
+    {
+        return strtolower((string) preg_replace('/(?<!^)[A-Z]/', '_$0', $value));
+    }
 }

src/Search/Aggregation.php

@@ -2,8 +2,6 @@
 
 namespace DirectoryTree\OpenSearchAdapter\Search;
 
-use Illuminate\Support\Collection;
-
 class Aggregation implements RawResponseInterface
 {
     /**
@@ -23,15 +21,13 @@ public function __construct(
     /**
      * Get the aggregation buckets.
      *
-     * @return Collection<int, Bucket>
+     * @return array<int, Bucket>
      */
-    public function buckets(): Collection
+    public function buckets(): array
     {
         $buckets = $this->aggregation['buckets'] ?? [];
 
-        return collect($buckets)->map(static function (array $bucket) {
-            return new Bucket($bucket);
-        });
+        return array_map(static fn (array $bucket) => new Bucket($bucket), $buckets);
     }
 
     /**

src/Search/Highlight.php

@@ -2,8 +2,6 @@
 
 namespace DirectoryTree\OpenSearchAdapter\Search;
 
-use Illuminate\Support\Collection;
-
 class Highlight implements RawResponseInterface
 {
     /**
@@ -23,11 +21,11 @@ public function __construct(
     /**
      * Get highlighted snippets for the given field.
      *
-     * @return Collection<int, string>
+     * @return array<int, string>
      */
-    public function snippets(string $field): Collection
+    public function snippets(string $field): array
     {
-        return collect($this->highlight[$field] ?? []);
+        return $this->highlight[$field] ?? [];
     }
 
     /**