Merge pull request #5 from boz14676/master

Change FuzzySearch.
tlikai · Sep 2, 2019 · 3df522c · 3df522c
2 parents 3825175 + 9da117f
commit 3df522c
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/src/Uniqueway/Repositories/Criteria/FuzzySearch.php b/src/Uniqueway/Repositories/Criteria/FuzzySearch.php
@@ -44,18 +44,15 @@ public function apply($model, Repository $repository)
             return $model;
         }
 
-        $where = 'where';
-        foreach ($this->attributes as $attribute) {
-            if ($attribute == 'id' && preg_match('/^\d+$/', $this->query)) {
-                $model = $model->$where($attribute, '=', $this->query);
-            } else {
-                $pattern = '%' . $this->query . '%';
-                $model = $model->$where($attribute, 'LIKE', $pattern);
+        return $model->where(function ($query) {
+            foreach ($this->attributes as $attribute) {
+                if ($attribute == 'id' && preg_match('/^\d+$/', $this->query)) {
+                    $query->orWhere($attribute, '=', $this->query);
+                } else {
+                    $pattern = '%' . $this->query . '%';
+                    $query->orWhere($attribute, 'LIKE', $pattern);
+                }
             }
-
-            $where = 'orWhere';
-        }
-
-        return $model;
+        });
     }
 }