Code reorg

pdphilip · pdphilip · commit 261ec233bb44 · 2025-04-13T00:59:53.000+02:00
diff --git a/src/Eloquent/Builder.php b/src/Eloquent/Builder.php
@@ -18,9 +18,9 @@
 use PDPhilip\Elasticsearch\Exceptions\BuilderException;
 use PDPhilip\Elasticsearch\Exceptions\DynamicIndexException;
 use PDPhilip\Elasticsearch\Exceptions\RuntimeException;
-use PDPhilip\Elasticsearch\Helpers\QueriesRelationships;
 use PDPhilip\Elasticsearch\Pagination\SearchAfterPaginator;
 use PDPhilip\Elasticsearch\Query\Builder as QueryBuilder;
+use PDPhilip\Elasticsearch\Relations\Traits\QueriesRelationships;
 use PDPhilip\Elasticsearch\Schema\Schema;
 
 /**
diff --git a/src/Eloquent/GeneratesUuids.php b/src/Eloquent/GeneratesUuids.php
@@ -3,7 +3,7 @@
 namespace PDPhilip\Elasticsearch\Eloquent;
 
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
-use PDPhilip\Elasticsearch\Helpers\Helpers;
+use PDPhilip\Elasticsearch\Utils\Helpers;
 
 trait GeneratesUuids
 {
diff --git a/src/Eloquent/HybridRelations.php b/src/Eloquent/HybridRelations.php
@@ -5,7 +5,6 @@
 namespace PDPhilip\Elasticsearch\Eloquent;
 
 use Illuminate\Support\Str;
-use PDPhilip\Elasticsearch\Helpers\EloquentBuilder;
 use PDPhilip\Elasticsearch\Relations\BelongsTo;
 use PDPhilip\Elasticsearch\Relations\BelongsToMany;
 use PDPhilip\Elasticsearch\Relations\HasMany;
@@ -14,6 +13,7 @@
 use PDPhilip\Elasticsearch\Relations\MorphOne;
 use PDPhilip\Elasticsearch\Relations\MorphTo;
 use PDPhilip\Elasticsearch\Relations\MorphToMany;
+use PDPhilip\Elasticsearch\Relations\Traits\EloquentBuilder;
 
 trait HybridRelations
 {
diff --git a/src/Laravel/Compatibility/Connection/ConnectionCompatibility.php b/src/Laravel/Compatibility/Connection/ConnectionCompatibility.php
@@ -2,9 +2,9 @@
 
 namespace PDPhilip\Elasticsearch\Laravel\Compatibility\Connection;
 
-use PDPhilip\Elasticsearch\Helpers\Helpers;
 use PDPhilip\Elasticsearch\Laravel\v11\Connection\ConnectionCompatibility as ConnectionCompatibility11;
 use PDPhilip\Elasticsearch\Laravel\v12\Connection\ConnectionCompatibility as ConnectionCompatibility12;
+use PDPhilip\Elasticsearch\Utils\Helpers;
 
 $laravelVersion = Helpers::getLaravelCompatabilityVersion();
 
diff --git a/src/Laravel/Compatibility/Schema/BlueprintCompatibility.php b/src/Laravel/Compatibility/Schema/BlueprintCompatibility.php
@@ -2,9 +2,9 @@
 
 namespace PDPhilip\Elasticsearch\Laravel\Compatibility\Schema;
 
-use PDPhilip\Elasticsearch\Helpers\Helpers;
 use PDPhilip\Elasticsearch\Laravel\v11\Schema\BlueprintCompatibility as BlueprintCompatibility11;
 use PDPhilip\Elasticsearch\Laravel\v12\Schema\BlueprintCompatibility as BlueprintCompatibility12;
+use PDPhilip\Elasticsearch\Utils\Helpers;
 
 $laravelVersion = Helpers::getLaravelCompatabilityVersion();
 
diff --git a/src/Laravel/Compatibility/Schema/BuilderCompatibility.php b/src/Laravel/Compatibility/Schema/BuilderCompatibility.php
@@ -2,9 +2,9 @@
 
 namespace PDPhilip\Elasticsearch\Laravel\Compatibility\Schema;
 
-use PDPhilip\Elasticsearch\Helpers\Helpers;
 use PDPhilip\Elasticsearch\Laravel\v11\Schema\BuilderCompatibility as BuilderCompatibility11;
 use PDPhilip\Elasticsearch\Laravel\v12\Schema\BuilderCompatibility as BuilderCompatibility12;
+use PDPhilip\Elasticsearch\Utils\Helpers;
 
 $laravelVersion = Helpers::getLaravelCompatabilityVersion();
 
diff --git a/src/Laravel/Compatibility/Schema/GrammarCompatibility.php b/src/Laravel/Compatibility/Schema/GrammarCompatibility.php
@@ -2,9 +2,9 @@
 
 namespace PDPhilip\Elasticsearch\Laravel\Compatibility\Schema;
 
-use PDPhilip\Elasticsearch\Helpers\Helpers;
 use PDPhilip\Elasticsearch\Laravel\v11\Schema\GrammarCompatibility as GrammarCompatibility11;
 use PDPhilip\Elasticsearch\Laravel\v12\Schema\GrammarCompatibility as GrammarCompatibility12;
+use PDPhilip\Elasticsearch\Utils\Helpers;
 
 $laravelVersion = Helpers::getLaravelCompatabilityVersion();
 
diff --git a/src/Query/Builder.php b/src/Query/Builder.php
@@ -24,9 +24,9 @@
 use PDPhilip\Elasticsearch\Exceptions\BuilderException;
 use PDPhilip\Elasticsearch\Exceptions\LogicException;
 use PDPhilip\Elasticsearch\Exceptions\RuntimeException;
-use PDPhilip\Elasticsearch\Helpers\Sanitizer;
 use PDPhilip\Elasticsearch\Schema\Schema;
 use PDPhilip\Elasticsearch\Traits\HasOptions;
+use PDPhilip\Elasticsearch\Utils\Sanitizer;
 
 /**
  * @method $this save()
diff --git a/src/Query/Grammar.php b/src/Query/Grammar.php
@@ -12,10 +12,10 @@
 use Illuminate\Support\Str;
 use InvalidArgumentException;
 use PDPhilip\Elasticsearch\Exceptions\BuilderException;
-use PDPhilip\Elasticsearch\Helpers\Helpers;
 use PDPhilip\Elasticsearch\Query\DSL\DslBuilder;
 use PDPhilip\Elasticsearch\Query\DSL\DslFactory;
 use PDPhilip\Elasticsearch\Query\DSL\QueryCompiler;
+use PDPhilip\Elasticsearch\Utils\Helpers;
 
 class Grammar extends BaseGrammar
 {
diff --git a/src/Query/Processor.php b/src/Query/Processor.php
@@ -9,7 +9,7 @@
 use Illuminate\Database\Query\Processors\Processor as BaseProcessor;
 use Illuminate\Support\Collection;
 use PDPhilip\Elasticsearch\Data\MetaDTO;
-use PDPhilip\Elasticsearch\Helpers\Sanitizer;
+use PDPhilip\Elasticsearch\Utils\Sanitizer;
 
 class Processor extends BaseProcessor
 {
diff --git a/src/Relations/Traits/EloquentBuilder.php b/src/Relations/Traits/EloquentBuilder.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PDPhilip\Elasticsearch\Helpers;
+namespace PDPhilip\Elasticsearch\Relations\Traits;
 
 use Illuminate\Database\Eloquent\Builder;
 
diff --git a/src/Relations/Traits/QueriesRelationships.php b/src/Relations/Traits/QueriesRelationships.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PDPhilip\Elasticsearch\Helpers;
+namespace PDPhilip\Elasticsearch\Relations\Traits;
 
 use Closure;
 use Exception;
diff --git a/src/Schema/Builder.php b/src/Schema/Builder.php
@@ -13,8 +13,8 @@
 use Illuminate\Support\Arr;
 use PDPhilip\Elasticsearch\Connection;
 use PDPhilip\Elasticsearch\Exceptions\LogicException;
-use PDPhilip\Elasticsearch\Helpers\Sanitizer;
 use PDPhilip\Elasticsearch\Laravel\Compatibility\Schema\BuilderCompatibility;
+use PDPhilip\Elasticsearch\Utils\Sanitizer;
 
 /**
  * @property Connection $connection
diff --git a/src/Traits/HasOptions.php b/src/Traits/HasOptions.php
@@ -5,7 +5,7 @@
 namespace PDPhilip\Elasticsearch\Traits;
 
 use PDPhilip\Elasticsearch\Contracts\ArrayStore as ArrayStoreContract;
-use PDPhilip\Elasticsearch\Repositories\ArrayStore;
+use PDPhilip\Elasticsearch\Utils\ArrayStore;
 
 trait HasOptions
 {
diff --git a/src/Utils/ArrayStore.php b/src/Utils/ArrayStore.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PDPhilip\Elasticsearch\Repositories;
+namespace PDPhilip\Elasticsearch\Utils;
 
 use Closure;
 use PDPhilip\Elasticsearch\Contracts\ArrayStore as ArrayStoreContract;
diff --git a/src/Utils/Helpers.php b/src/Utils/Helpers.php
@@ -2,13 +2,12 @@
 
 declare(strict_types=1);
 
-namespace PDPhilip\Elasticsearch\Helpers;
+namespace PDPhilip\Elasticsearch\Utils;
 
 use Closure;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\Str;
 use PDPhilip\Elasticsearch\Exceptions\RuntimeException;
-use PDPhilip\Elasticsearch\Utils\TimeBasedUUIDGenerator;
 
 final class Helpers
 {
diff --git a/src/Utils/Sanitizer.php b/src/Utils/Sanitizer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PDPhilip\Elasticsearch\Helpers;
+namespace PDPhilip\Elasticsearch\Utils;
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
diff --git a/tests/Benchmarks/UuidBenchmarks.php b/tests/Benchmarks/UuidBenchmarks.php
@@ -3,7 +3,7 @@
 namespace PDPhilip\Elasticsearch\Tests\Benchmarks;
 
 use AllowDynamicProperties;
-use PDPhilip\Elasticsearch\Helpers\Helpers;
+use PDPhilip\Elasticsearch\Utils\Helpers;
 use PDPhilip\Elasticsearch\Utils\TimeBasedUUIDGenerator;
 use PDPhilip\Elasticsearch\Utils\Timer;
 
diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -5,8 +5,8 @@
 use Illuminate\Support\Facades\DB;
 use PDPhilip\Elasticsearch\Connection;
 use PDPhilip\Elasticsearch\ElasticClient as Client;
-use PDPhilip\Elasticsearch\Helpers\Helpers;
 use PDPhilip\Elasticsearch\Schema\Builder as SchemaBuilder;
+use PDPhilip\Elasticsearch\Utils\Helpers;
 
 function getLaravelVersion(): int
 {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace PDPhilip\Elasticsearch\Eloquent;`
`4`	`4`
`5`	`5`	`use Illuminate\Database\Eloquent\Concerns\HasUuids;`
`6`		`-use PDPhilip\Elasticsearch\Helpers\Helpers;`
	`6`	`+use PDPhilip\Elasticsearch\Utils\Helpers;`
`7`	`7`
`8`	`8`	`trait GeneratesUuids`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`use Illuminate\Database\Query\Processors\Processor as BaseProcessor;`
`10`	`10`	`use Illuminate\Support\Collection;`
`11`	`11`	`use PDPhilip\Elasticsearch\Data\MetaDTO;`
`12`		`-use PDPhilip\Elasticsearch\Helpers\Sanitizer;`
	`12`	`+use PDPhilip\Elasticsearch\Utils\Sanitizer;`
`13`	`13`
`14`	`14`	`class Processor extends BaseProcessor`
`15`	`15`	`{`