Merge pull request #21 from mahmoudmohamedramadan/revert-20-development

Revert "[1.x] Undo changes"

src/Concerns/Search/HasModel.php

@@ -85,30 +85,6 @@ protected function getRelationship()
         return $this->relationship;
     }
 
-    /**
-     * Resolve the model for the current context.
-     *
-     * @return void
-     *
-     * @throws \Ramadan\EasyModel\Exceptions\InvalidModel
-     */
-    protected function resolveModel()
-    {
-        // We will check if the model has been set using the "setSearchableModel" method
-        // as a manual setting is more of a priority otherwise it means the developer uses
-        // the "Searchable" trait in the model itself.
-        if (!empty($this->getSearchableModel())) {
-            return;
-        }
-
-        if (is_a(self::class, Model::class, true)) {
-            $this->setSearchableModel(self::class);
-            return;
-        }
-
-        throw new InvalidModel("Cannot resolve the searchable model.");
-    }
-
     /**
      * Apply the scopes to the query.
      *

src/Searchable.php

@@ -229,8 +229,6 @@ public function addOrWhereRelation(array $wheres, EloquentBuilder $query = null)
      */
     protected function getSearchableEloquentBuilder()
     {
-        $this->resolveModel();
-
         $model        = $this->getSearchableModel();
         $relationship = $this->getRelationship();