V3 clean

Author: pdphilip

composer.json

@@ -23,6 +23,7 @@
     "illuminate/database": "^10.30|^11|^12",
     "illuminate/events": "^10.0|^11|^12",
     "illuminate/support": "^10.0|^11|^12",
+    "pdphilip/elasticsearch": "v5.0.3",
     "opensearch-project/opensearch-php": "2.3.1",
     "spatie/ignition": "^1.15"
   },
@@ -40,6 +41,9 @@
     "phpstan/phpstan-deprecation-rules": "^2",
     "phpstan/phpstan-phpunit": "^2"
   },
+  "replace": {
+    "elasticsearch/elasticsearch": "*"
+  },
   "autoload-dev": {
     "psr-4": {
       "PDPhilip\\OpenSearch\\Tests\\": "tests/"

src/Connection.php

@@ -16,13 +16,13 @@
 use OpenSearch\Helper\Iterators\SearchHitIterator;
 use OpenSearch\Helper\Iterators\SearchResponseIterator;
 use OpenSearch\Namespaces\IndicesNamespace;
+use PDPhilip\Elasticsearch\Traits\HasOptions;
 use PDPhilip\OpenSearch\Exceptions\BulkInsertQueryException;
 use PDPhilip\OpenSearch\Exceptions\QueryException;
 use PDPhilip\OpenSearch\Laravel\Compatibility\Connection\ConnectionCompatibility;
 use PDPhilip\OpenSearch\Query\Builder;
 use PDPhilip\OpenSearch\Query\Processor;
 use PDPhilip\OpenSearch\Schema\Blueprint;
-use PDPhilip\OpenSearch\Traits\HasOptions;
 
 use function array_replace_recursive;
 use function is_array;

src/Contracts/ArrayStore.php

@@ -6,7 +6,7 @@
 
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Arr;
-use PDPhilip\OpenSearch\Traits\Makeable;
+use PDPhilip\Elasticsearch\Traits\Makeable;
 
 class MetaDTO implements Arrayable
 {

src/Data/MetaDTO.php

@@ -14,13 +14,13 @@
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Collection;
 use Iterator;
+use PDPhilip\Elasticsearch\Pagination\SearchAfterPaginator;
 use PDPhilip\OpenSearch\Data\MetaDTO;
 use PDPhilip\OpenSearch\Exceptions\BuilderException;
 use PDPhilip\OpenSearch\Exceptions\DynamicIndexException;
 use PDPhilip\OpenSearch\Exceptions\RuntimeException;
-use PDPhilip\OpenSearch\Helpers\QueriesRelationships;
-use PDPhilip\OpenSearch\Pagination\SearchAfterPaginator;
 use PDPhilip\OpenSearch\Query\Builder as QueryBuilder;
+use PDPhilip\OpenSearch\Relations\Traits\QueriesRelationships;
 use PDPhilip\OpenSearch\Schema\Schema;
 
 /**

src/Eloquent/Builder.php

@@ -3,7 +3,7 @@
 namespace PDPhilip\OpenSearch\Eloquent;
 
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
-use PDPhilip\OpenSearch\Helpers\Helpers;
+use PDPhilip\Elasticsearch\Helpers\Helpers;
 
 trait GeneratesUuids
 {

src/Eloquent/GeneratesUuids.php

@@ -5,9 +5,9 @@
 namespace PDPhilip\OpenSearch\Eloquent;
 
 use Illuminate\Support\Str;
-use PDPhilip\OpenSearch\Helpers\EloquentBuilder;
 use PDPhilip\OpenSearch\Relations\BelongsTo;
 use PDPhilip\OpenSearch\Relations\BelongsToMany;
+use PDPhilip\OpenSearch\Relations\EloquentBuilder;
 use PDPhilip\OpenSearch\Relations\HasMany;
 use PDPhilip\OpenSearch\Relations\HasOne;
 use PDPhilip\OpenSearch\Relations\MorphMany;
@@ -317,7 +317,7 @@ public function morphedByMany(
     ) {
         // If the related model is an instance of eloquent model class, leave pivot keys
         // as default. It's necessary for supporting hybrid relationship
-        if (Model::isOpenSearchModel($related)) {
+        if (Model::isOpenModel($related)) {
             // For the inverse of the polymorphic many-to-many relations, we will change
             // the way we determine the foreign and other keys, as it is the opposite
             // of the morph-to-many method since we're figuring out these inverses.
@@ -345,7 +345,7 @@ public function morphedByMany(
      */
     public function newEloquentBuilder($query)
     {
-        if (Model::isOpenSearchModel($this)) {
+        if (Model::isOpenModel($this)) {
             return new Builder($query);
         }
 
@@ -355,9 +355,9 @@ public function newEloquentBuilder($query)
     protected function nonElasticModel($related, $includingSelf = false): bool
     {
         if ($includingSelf) {
-            return ! Model::isOpenSearchModel($related) && ! Model::isOpenSearchModel($this);
+            return ! Model::isOpenModel($related) && ! Model::isOpenModel($this);
         }
 
-        return ! Model::isOpenSearchModel($related);
+        return ! Model::isOpenModel($related);
     }
 }

src/Eloquent/HybridRelations.php

@@ -48,11 +48,9 @@ public function getTable()
      * It must be a subclass of {@see BaseModel} and use the
      * {@see OpenSearchModel} trait.
      *
-     * implementation of https://github.com/mongodb/laravel-mongodb/blob/5.x/src/Eloquent/Model.php
-     *
      * @param  class-string|object  $class
      */
-    final public static function isOpenSearchModel(string|object $class): bool
+    final public static function isOpenModel(string|object $class): bool
     {
         if (is_object($class)) {
             $class = $class::class;

src/Eloquent/Model.php

@@ -10,11 +10,11 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
+use PDPhilip\Elasticsearch\Traits\HasOptions;
 use PDPhilip\OpenSearch\Connection;
 use PDPhilip\OpenSearch\Data\ModelMeta;
 use PDPhilip\OpenSearch\Eloquent\Docs\ModelDocs;
 use PDPhilip\OpenSearch\Exceptions\RuntimeException;
-use PDPhilip\OpenSearch\Traits\HasOptions;
 
 /**
  * @property object $searchHighlights

src/Eloquent/OpenSearchModel.php

@@ -2,7 +2,7 @@
 
 namespace PDPhilip\OpenSearch\Laravel\Compatibility\Connection;
 
-use PDPhilip\OpenSearch\Helpers\Helpers;
+use PDPhilip\Elasticsearch\Helpers\Helpers;
 use PDPhilip\OpenSearch\Laravel\v11\Connection\ConnectionCompatibility as ConnectionCompatibility11;
 use PDPhilip\OpenSearch\Laravel\v12\Connection\ConnectionCompatibility as ConnectionCompatibility12;
 

src/Helpers/Helpers.php

@@ -2,7 +2,7 @@
 
 namespace PDPhilip\OpenSearch\Laravel\Compatibility\Schema;
 
-use PDPhilip\OpenSearch\Helpers\Helpers;
+use PDPhilip\Elasticsearch\Helpers\Helpers;
 use PDPhilip\OpenSearch\Laravel\v11\Schema\BlueprintCompatibility as BlueprintCompatibility11;
 use PDPhilip\OpenSearch\Laravel\v12\Schema\BlueprintCompatibility as BlueprintCompatibility12;
 

src/Helpers/Sanitizer.php

@@ -2,7 +2,7 @@
 
 namespace PDPhilip\OpenSearch\Laravel\Compatibility\Schema;
 
-use PDPhilip\OpenSearch\Helpers\Helpers;
+use PDPhilip\Elasticsearch\Helpers\Helpers;
 use PDPhilip\OpenSearch\Laravel\v11\Schema\BuilderCompatibility as BuilderCompatibility11;
 use PDPhilip\OpenSearch\Laravel\v12\Schema\BuilderCompatibility as BuilderCompatibility12;
 

src/Laravel/Compatibility/Connection/ConnectionCompatibility.php

@@ -2,7 +2,7 @@
 
 namespace PDPhilip\OpenSearch\Laravel\Compatibility\Schema;
 
-use PDPhilip\OpenSearch\Helpers\Helpers;
+use PDPhilip\Elasticsearch\Helpers\Helpers;
 use PDPhilip\OpenSearch\Laravel\v11\Schema\GrammarCompatibility as GrammarCompatibility11;
 use PDPhilip\OpenSearch\Laravel\v12\Schema\GrammarCompatibility as GrammarCompatibility12;