@@ -9,11 +9,11 @@ discard block |
||
| 9 | 9 | { |
| 10 | 10 | public function scopeSearchable(Builder $query, Request $request = null) : Builder |
| 11 | 11 | { |
| 12 | - if ($request === null) { |
|
| 12 | + if ( $request === null ) { |
|
| 13 | 13 | $request = request(); |
| 14 | 14 | } |
| 15 | 15 | |
| 16 | - if ($request->get(config('searchable.parameter')) === null || ! is_array($request->get(config('searchable.parameter')))) { |
|
| 16 | + if ( $request->get(config('searchable.parameter')) === null || !is_array($request->get(config('searchable.parameter'))) ) { |
|
| 17 | 17 | return $query; |
| 18 | 18 | } |
| 19 | 19 | |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | $this->getSearchables() |
| 23 | 23 | ); |
| 24 | 24 | |
| 25 | - if ($searchables) { |
|
| 25 | + if ( $searchables ) { |
|
| 26 | 26 | $this->addSearchablesToBuilder($searchables, $query); |
| 27 | 27 | } |
| 28 | 28 | |
@@ -31,23 +31,23 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | private function addSearchablesToBuilder(array $searchables, Builder $query) : Builder |
| 33 | 33 | { |
| 34 | - $query->where(function (Builder $query) use ($searchables) { |
|
| 34 | + $query->where(function(Builder $query) use ($searchables) { |
|
| 35 | 35 | foreach ($searchables as $key => $value) { |
| 36 | - if (empty($value)) { |
|
| 36 | + if ( empty($value) ) { |
|
| 37 | 37 | continue; |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | $searchable = $this->searchables[$key]; |
| 41 | 41 | |
| 42 | - if (is_array($searchable)) { |
|
| 42 | + if ( is_array($searchable) ) { |
|
| 43 | 43 | |
| 44 | 44 | // TODO: handle when the value is also an array with multiple values to search on |
| 45 | 45 | |
| 46 | 46 | // TODO: handle relationships which has an array |
| 47 | 47 | |
| 48 | - $query->where(function ($query) use ($searchable, $value) { |
|
| 48 | + $query->where(function($query) use ($searchable, $value) { |
|
| 49 | 49 | foreach ($searchable as $column => $operator) { |
| 50 | - if ($operator === 'like') { |
|
| 50 | + if ( $operator === 'like' ) { |
|
| 51 | 51 | $value = '%'.$value.'%'; |
| 52 | 52 | } |
| 53 | 53 | |
@@ -55,14 +55,14 @@ discard block |
||
| 55 | 55 | } |
| 56 | 56 | }); |
| 57 | 57 | } else { |
| 58 | - if (is_array($value)) { |
|
| 58 | + if ( is_array($value) ) { |
|
| 59 | 59 | $values = $value; |
| 60 | 60 | |
| 61 | - if (method_exists($query->getModel(), $key)) { |
|
| 62 | - $query->whereHas($key, function ($query) use ($key, $values) { |
|
| 61 | + if ( method_exists($query->getModel(), $key) ) { |
|
| 62 | + $query->whereHas($key, function($query) use ($key, $values) { |
|
| 63 | 63 | $query->where(function($query) use ($key, $values) { |
| 64 | 64 | foreach ($values as $value) { |
| 65 | - if ($this->searchables[$key] === 'like') { |
|
| 65 | + if ( $this->searchables[$key] === 'like' ) { |
|
| 66 | 66 | $value = '%'.$value.'%'; |
| 67 | 67 | } |
| 68 | 68 | |
@@ -71,9 +71,9 @@ discard block |
||
| 71 | 71 | }); |
| 72 | 72 | }); |
| 73 | 73 | } else { |
| 74 | - $query->where(function ($query) use ($key, $values) { |
|
| 74 | + $query->where(function($query) use ($key, $values) { |
|
| 75 | 75 | foreach ($values as $value) { |
| 76 | - if ($this->searchables[$key] === 'like') { |
|
| 76 | + if ( $this->searchables[$key] === 'like' ) { |
|
| 77 | 77 | $value = '%'.$value.'%'; |
| 78 | 78 | } |
| 79 | 79 | |
@@ -83,12 +83,12 @@ discard block |
||
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | } else { |
| 86 | - if ($this->searchables[$key] === 'like') { |
|
| 86 | + if ( $this->searchables[$key] === 'like' ) { |
|
| 87 | 87 | $value = '%'.$value.'%'; |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | - if (method_exists($query->getModel(), $key)) { |
|
| 91 | - $query->whereHas($key, function ($query) use ($key, $value) { |
|
| 90 | + if ( method_exists($query->getModel(), $key) ) { |
|
| 91 | + $query->whereHas($key, function($query) use ($key, $value) { |
|
| 92 | 92 | $query->where('id', $this->searchables[$key], $value); |
| 93 | 93 | }); |
| 94 | 94 | } else { |