Scrutinizer GitHub App not installed

We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.

Install GitHub App

Passed
Pull Request — master (#3123)
by Mokhlas
13:13
created
src/helpers.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (! function_exists('backpack_url')) {
3
+if (!function_exists('backpack_url')) {
4 4
     /**
5 5
      * Appends the configured backpack prefix and returns
6 6
      * the URL using the standard Laravel helpers.
@@ -11,13 +11,13 @@  discard block
 block discarded – undo
11 11
      */
12 12
     function backpack_url($path = null, $parameters = [], $secure = null)
13 13
     {
14
-        $path = ! $path || (substr($path, 0, 1) == '/') ? $path : '/'.$path;
14
+        $path = !$path || (substr($path, 0, 1) == '/') ? $path : '/'.$path;
15 15
 
16 16
         return url(config('backpack.base.route_prefix', 'admin').$path, $parameters, $secure);
17 17
     }
18 18
 }
19 19
 
20
-if (! function_exists('backpack_authentication_column')) {
20
+if (!function_exists('backpack_authentication_column')) {
21 21
     /**
22 22
      * Return the username column name.
23 23
      * The Laravel default (and Backpack default) is 'email'.
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
     }
31 31
 }
32 32
 
33
-if (! function_exists('backpack_users_have_email')) {
33
+if (!function_exists('backpack_users_have_email')) {
34 34
     /**
35 35
      * Check if the email column is present on the user table.
36 36
      *
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
     }
46 46
 }
47 47
 
48
-if (! function_exists('backpack_avatar_url')) {
48
+if (!function_exists('backpack_avatar_url')) {
49 49
     /**
50 50
      * Returns the avatar URL of a user.
51 51
      *
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
     }
79 79
 }
80 80
 
81
-if (! function_exists('backpack_middleware')) {
81
+if (!function_exists('backpack_middleware')) {
82 82
     /**
83 83
      * Return the key of the middleware used across Backpack.
84 84
      * That middleware checks if the visitor is an admin.
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
     }
94 94
 }
95 95
 
96
-if (! function_exists('backpack_guard_name')) {
96
+if (!function_exists('backpack_guard_name')) {
97 97
     /*
98 98
      * Returns the name of the guard defined
99 99
      * by the application config
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
     }
105 105
 }
106 106
 
107
-if (! function_exists('backpack_auth')) {
107
+if (!function_exists('backpack_auth')) {
108 108
     /*
109 109
      * Returns the user instance if it exists
110 110
      * of the currently authenticated admin
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
     }
117 117
 }
118 118
 
119
-if (! function_exists('backpack_user')) {
119
+if (!function_exists('backpack_user')) {
120 120
     /*
121 121
      * Returns back a user instance without
122 122
      * the admin guard, however allows you
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
     }
129 129
 }
130 130
 
131
-if (! function_exists('mb_ucfirst')) {
131
+if (!function_exists('mb_ucfirst')) {
132 132
     /**
133 133
      * Capitalize the first letter of a string,
134 134
      * even if that string is multi-byte (non-latin alphabet).
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
     }
151 151
 }
152 152
 
153
-if (! function_exists('backpack_view')) {
153
+if (!function_exists('backpack_view')) {
154 154
     /**
155 155
      * Returns a new displayable view based on the configured backpack view namespace.
156 156
      * If that view doesn't exist, it will load the one from the original theme.
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 
171 171
         $returnView = $theme.$view;
172 172
 
173
-        if (! view()->exists($returnView)) {
173
+        if (!view()->exists($returnView)) {
174 174
             $returnView = $originalTheme.$view;
175 175
         }
176 176
 
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
     }
179 179
 }
180 180
 
181
-if (! function_exists('square_brackets_to_dots')) {
181
+if (!function_exists('square_brackets_to_dots')) {
182 182
     /**
183 183
      * Turns a string from bracket-type array to dot-notation array.
184 184
      * Ex: array[0][property] turns into array.0.property.
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
     }
196 196
 }
197 197
 
198
-if (! function_exists('is_countable')) {
198
+if (!function_exists('is_countable')) {
199 199
     /**
200 200
      * We need this because is_countable was only introduced in PHP 7.3,
201 201
      * and in PHP 7.2 you should check if count() argument is really countable.
Please login to merge, or discard this patch.
src/app/Library/CrudPanel/Traits/Update.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 
53 53
         foreach ($fields as &$field) {
54 54
             // set the value
55
-            if (! isset($field['value'])) {
55
+            if (!isset($field['value'])) {
56 56
                 if (isset($field['subfields'])) {
57 57
                     $field['value'] = [];
58 58
                     foreach ($field['subfields'] as $subfield) {
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
         }
66 66
 
67 67
         // always have a hidden input for the entry id
68
-        if (! array_key_exists('id', $fields)) {
68
+        if (!array_key_exists('id', $fields)) {
69 69
             $fields['id'] = [
70 70
                 'name'  => $entry->getKeyName(),
71 71
                 'value' => $entry->getKey(),
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 
92 92
             $relation_array = explode('.', $relational_entity);
93 93
 
94
-            $relatedModel = $relatedModel = array_reduce(array_splice($relation_array, 0, -1), function ($obj, $method) {
94
+            $relatedModel = $relatedModel = array_reduce(array_splice($relation_array, 0, -1), function($obj, $method) {
95 95
                 return $obj->{$method} ? $obj->{$method} : $obj;
96 96
             }, $model);
97 97
 
Please login to merge, or discard this patch.
src/app/Library/CrudPanel/Traits/FieldsProtectedMethods.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
      */
70 70
     public function overwriteFieldNameFromDotNotationToArray($field)
71 71
     {
72
-        if (! is_array($field['name']) && strpos($field['name'], '.') !== false) {
72
+        if (!is_array($field['name']) && strpos($field['name'], '.') !== false) {
73 73
             $entity_array = explode('.', $field['name']);
74 74
             $name_string = '';
75 75
 
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
             return ['name' => $field];
97 97
         }
98 98
 
99
-        if (is_array($field) && ! isset($field['name'])) {
99
+        if (is_array($field) && !isset($field['name'])) {
100 100
             abort(500, 'All fields must have their name defined');
101 101
         }
102 102
 
@@ -154,13 +154,13 @@  discard block
 block discarded – undo
154 154
     protected function makeSureFieldHasRelationshipData($field)
155 155
     {
156 156
         // only do this if "entity" is defined on the field
157
-        if (! isset($field['entity'])) {
157
+        if (!isset($field['entity'])) {
158 158
             return $field;
159 159
         }
160 160
 
161 161
         $extraFieldAttributes = $this->inferFieldAttributesFromRelationship($field);
162 162
 
163
-        if (! empty($extraFieldAttributes)) {
163
+        if (!empty($extraFieldAttributes)) {
164 164
             $field = array_merge($field, $extraFieldAttributes);
165 165
         } else {
166 166
             abort(500, 'Unable to process relationship data: '.$field['name']);
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
     protected function overwriteFieldNameFromEntity($field)
173 173
     {
174 174
         // if the entity doesn't have a dot, it means we don't need to overwrite the name
175
-        if (! Str::contains($field['entity'], '.')) {
175
+        if (!Str::contains($field['entity'], '.')) {
176 176
             return $field;
177 177
         }
178 178
 
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
         if (count(explode('.', $field['entity'])) == count(explode('.', $this->getOnlyRelationEntity($field)))) {
185 185
             $field['name'] = implode('.', array_slice(explode('.', $field['entity']), 0, -1));
186 186
             $relation = $this->getRelationInstance($field);
187
-            if (! empty($field['name'])) {
187
+            if (!empty($field['name'])) {
188 188
                 $field['name'] .= '.';
189 189
             }
190 190
             $field['name'] .= $relation->getForeignKeyName();
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
     {
198 198
         // if there's a model defined, but no attribute
199 199
         // guess an attribute using the indentifiableAttribute functionality in CrudTrait
200
-        if (isset($field['model']) && ! isset($field['attribute'])) {
200
+        if (isset($field['model']) && !isset($field['attribute'])) {
201 201
             $field['attribute'] = call_user_func([(new $field['model']), 'identifiableAttribute']);
202 202
         }
203 203
 
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
      */
214 214
     protected function makeSureFieldHasLabel($field)
215 215
     {
216
-        if (! isset($field['label'])) {
216
+        if (!isset($field['label'])) {
217 217
             $name = is_array($field['name']) ? $field['name'][0] : $field['name'];
218 218
             $name = str_replace('_id', '', $name);
219 219
             $field['label'] = mb_ucfirst(str_replace('_', ' ', $name));
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
      */
232 232
     protected function makeSureFieldHasType($field)
233 233
     {
234
-        if (! isset($field['type'])) {
234
+        if (!isset($field['type'])) {
235 235
             $field['type'] = isset($field['relation_type']) ? $this->inferFieldTypeFromFieldRelation($field) : $this->inferFieldTypeFromDbColumnType($field['name']);
236 236
         }
237 237
 
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
     {
249 249
         // if a tab was mentioned, we should enable it
250 250
         if (isset($field['tab'])) {
251
-            if (! $this->tabsEnabled()) {
251
+            if (!$this->tabsEnabled()) {
252 252
                 $this->enableTabs();
253 253
             }
254 254
         }
Please login to merge, or discard this patch.
src/app/Library/CrudPanel/Traits/Columns.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
      */
115 115
     public function makeFirstColumn()
116 116
     {
117
-        if (! $this->columns()) {
117
+        if (!$this->columns()) {
118 118
             return false;
119 119
         }
120 120
 
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
      */
160 160
     public function removeColumns($columns)
161 161
     {
162
-        if (! empty($columns)) {
162
+        if (!empty($columns)) {
163 163
             foreach ($columns as $columnKey) {
164 164
                 $this->removeColumn($columnKey);
165 165
             }
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
     {
253 253
         $columns = $this->columns();
254 254
 
255
-        return collect($columns)->pluck('entity')->reject(function ($value, $key) {
255
+        return collect($columns)->pluck('entity')->reject(function($value, $key) {
256 256
             return $value == null;
257 257
         })->toArray();
258 258
     }
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
      */
330 330
     public function hasColumnWhere($attribute, $value)
331 331
     {
332
-        $match = Arr::first($this->columns(), function ($column, $columnKey) use ($attribute, $value) {
332
+        $match = Arr::first($this->columns(), function($column, $columnKey) use ($attribute, $value) {
333 333
             return isset($column[$attribute]) && $column[$attribute] == $value;
334 334
         });
335 335
 
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
      */
346 346
     public function firstColumnWhere($attribute, $value)
347 347
     {
348
-        return Arr::first($this->columns(), function ($column, $columnKey) use ($attribute, $value) {
348
+        return Arr::first($this->columns(), function($column, $columnKey) use ($attribute, $value) {
349 349
             return isset($column[$attribute]) && $column[$attribute] == $value;
350 350
         });
351 351
     }
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
 
379 379
         // check if it's a method on the model,
380 380
         // that means it's a relationship
381
-        if (! $columnExistsInDb && method_exists($this->model, $column['name'])) {
381
+        if (!$columnExistsInDb && method_exists($this->model, $column['name'])) {
382 382
             $relatedModel = $this->model->{$column['name']}()->getRelated();
383 383
             $column['entity'] = $column['name'];
384 384
             $column['model'] = get_class($relatedModel);
Please login to merge, or discard this patch.
src/app/Library/CrudPanel/Traits/ColumnsProtectedMethods.php 1 patch
Spacing   +9 added lines, -10 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 
22 22
         // make sure the column has a priority in terms of visibility
23 23
         // if no priority has been defined, use the order in the array plus one
24
-        if (! array_key_exists('priority', $column)) {
24
+        if (!array_key_exists('priority', $column)) {
25 25
             $position_in_columns_array = (int) array_search($column['key'], array_keys($this->columns()));
26 26
             $allColumns[$column['key']]['priority'] = $position_in_columns_array + 1;
27 27
         }
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
             $column = ['name' => $column];
43 43
         }
44 44
 
45
-        if (is_array($column) && ! isset($column['name'])) {
45
+        if (is_array($column) && !isset($column['name'])) {
46 46
             $column['name'] = 'anonymous_column_'.Str::random(5);
47 47
         }
48 48
 
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
      */
59 59
     protected function makeSureColumnHasLabel($column)
60 60
     {
61
-        if (! isset($column['label'])) {
61
+        if (!isset($column['label'])) {
62 62
             $column['label'] = mb_ucfirst($this->makeLabel($column['name']));
63 63
         }
64 64
 
@@ -75,11 +75,11 @@  discard block
 block discarded – undo
75 75
     {
76 76
         // if it's got a method on the model with the same name
77 77
         // then it should be a relationship
78
-        if (! isset($column['type']) && method_exists($this->model, $column['name'])) {
78
+        if (!isset($column['type']) && method_exists($this->model, $column['name'])) {
79 79
             $column['type'] = 'relationship';
80 80
         }
81 81
 
82
-        if (! isset($column['type'])) {
82
+        if (!isset($column['type'])) {
83 83
             $column['type'] = 'text';
84 84
         }
85 85
 
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
      */
97 97
     protected function makeSureColumnHasKey($column)
98 98
     {
99
-        if (! isset($column['key'])) {
99
+        if (!isset($column['key'])) {
100 100
             $column['key'] = str_replace('.', '__', $column['name']);
101 101
         }
102 102
 
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
      */
115 115
     protected function makeSureColumnHasWrapper($column)
116 116
     {
117
-        if (! isset($column['wrapper'])) {
117
+        if (!isset($column['wrapper'])) {
118 118
             $column['wrapper'] = [];
119 119
         }
120 120
 
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
     {
133 133
         // if this is a relation type field and no corresponding model was specified,
134 134
         // get it from the relation method defined in the main model
135
-        if (isset($column['entity']) && ! isset($column['model'])) {
135
+        if (isset($column['entity']) && !isset($column['model'])) {
136 136
             $column['model'] = $this->getRelationModel($column['entity']);
137 137
         }
138 138
 
@@ -153,8 +153,7 @@  discard block
 block discarded – undo
153 153
         $columnsArray = $this->columns();
154 154
 
155 155
         if (array_key_exists($targetColumnName, $columnsArray)) {
156
-            $targetColumnPosition = $before ? array_search($targetColumnName, array_keys($columnsArray)) :
157
-                array_search($targetColumnName, array_keys($columnsArray)) + 1;
156
+            $targetColumnPosition = $before ? array_search($targetColumnName, array_keys($columnsArray)) : array_search($targetColumnName, array_keys($columnsArray)) + 1;
158 157
 
159 158
             $element = array_pop($columnsArray);
160 159
             $beginningPart = array_slice($columnsArray, 0, $targetColumnPosition, true);
Please login to merge, or discard this patch.
src/app/Console/Commands/AddCustomRouteContent.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 
73 73
             $process = new Process($command, null, null, null, 300, null);
74 74
 
75
-            $process->run(function ($type, $buffer) {
75
+            $process->run(function($type, $buffer) {
76 76
                 if (Process::ERR === $type) {
77 77
                     $this->line($buffer);
78 78
                 } else {
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
             });
82 82
 
83 83
             // executes after the command finishes
84
-            if (! $process->isSuccessful()) {
84
+            if (!$process->isSuccessful()) {
85 85
                 throw new ProcessFailedException($process);
86 86
             }
87 87
 
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 
101 101
         // otherwise, in case the last line HAS been modified
102 102
         // return the last line that has an ending in it
103
-        $possible_end_lines = array_filter($file_lines, function ($k) {
103
+        $possible_end_lines = array_filter($file_lines, function($k) {
104 104
             return strpos($k, '});') === 0;
105 105
         });
106 106
 
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
      */
122 122
     private function getLastLineNumberThatContains($needle, $haystack)
123 123
     {
124
-        $matchingLines = array_filter($haystack, function ($k) use ($needle) {
124
+        $matchingLines = array_filter($haystack, function($k) use ($needle) {
125 125
             return strpos($k, $needle) !== false;
126 126
         });
127 127
 
Please login to merge, or discard this patch.
src/app/Console/Commands/AddSidebarContent.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
      */
72 72
     private function getLastLineNumberThatContains($needle, $haystack)
73 73
     {
74
-        $matchingLines = array_filter($haystack, function ($k) use ($needle) {
74
+        $matchingLines = array_filter($haystack, function($k) use ($needle) {
75 75
             return strpos($k, $needle) !== false;
76 76
         });
77 77
 
Please login to merge, or discard this patch.
src/app/Library/CrudPanel/Traits/Filters.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
         $this->enableFilters();
74 74
 
75 75
         // check if another filter with the same name exists
76
-        if (! isset($options['name'])) {
76
+        if (!isset($options['name'])) {
77 77
             abort(500, 'All your filters need names.');
78 78
         } else {
79 79
             // make sure we check against the converted camel name before adding.
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
     {
124 124
         $unappliedFilters = $this->filters()->where('applied', false);
125 125
         if ($unappliedFilters->count()) {
126
-            $unappliedFilters->each(function ($filter) {
126
+            $unappliedFilters->each(function($filter) {
127 127
                 $filter->apply();
128 128
             });
129 129
         }
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
     {
174 174
         $filter = $this->filters()->firstWhere('name', $name);
175 175
 
176
-        if (! $filter) {
176
+        if (!$filter) {
177 177
             abort(500, 'CRUD Filter "'.$name.'" not found. Please check the filter exists before you modify it.');
178 178
         }
179 179
 
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 
189 189
     public function replaceFilter($name, $newFilter)
190 190
     {
191
-        $newFilters = $this->filters()->map(function ($filter, $key) use ($name, $newFilter) {
191
+        $newFilters = $this->filters()->map(function($filter, $key) use ($name, $newFilter) {
192 192
             if ($filter->name != $name) {
193 193
                 return $filter;
194 194
             }
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 
202 202
     public function removeFilter($name)
203 203
     {
204
-        $strippedCollection = $this->filters()->reject(function ($filter) use ($name) {
204
+        $strippedCollection = $this->filters()->reject(function($filter) use ($name) {
205 205
             return $filter->name == $name;
206 206
         });
207 207
 
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
      */
245 245
     public function makeFirstFilter()
246 246
     {
247
-        if (! $this->filters()) {
247
+        if (!$this->filters()) {
248 248
             return false;
249 249
         }
250 250
 
@@ -274,15 +274,15 @@  discard block
 block discarded – undo
274 274
         $destinationFilter = $this->firstFilterWhere('name', $destination);
275 275
         $destinationKey = $this->getFilterKey($destination);
276 276
         $newDestinationKey = ($where == 'before' ? $destinationKey : $destinationKey + 1);
277
-        $newFilters = $this->filters()->filter(function ($value, $key) use ($target) {
277
+        $newFilters = $this->filters()->filter(function($value, $key) use ($target) {
278 278
             return $value->name != $target;
279 279
         });
280 280
 
281
-        if (! $targetFilter) {
281
+        if (!$targetFilter) {
282 282
             return;
283 283
         }
284 284
 
285
-        if (! $destinationFilter) {
285
+        if (!$destinationFilter) {
286 286
             return;
287 287
         }
288 288
 
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
         $lastSlice = $newFilters->slice($newDestinationKey, null);
291 291
 
292 292
         $newFilters = $firstSlice->push($targetFilter);
293
-        $lastSlice->each(function ($item, $key) use ($newFilters) {
293
+        $lastSlice->each(function($item, $key) use ($newFilters) {
294 294
             $newFilters->push($item);
295 295
         });
296 296
 
Please login to merge, or discard this patch.
src/app/Http/Controllers/Operations/FetchOperation.php 1 patch
Spacing   +6 added lines, -8 removed lines patch added patch discarded remove patch
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
         // otherwise assume the arguments are actually the configuration array
46 46
         $config = [];
47 47
 
48
-        if (! is_array($arg)) {
49
-            if (! class_exists($arg)) {
48
+        if (!is_array($arg)) {
49
+            if (!class_exists($arg)) {
50 50
                 return response()->json(['error' => 'Class: '.$arg.' does not exists'], 500);
51 51
             }
52 52
             $config['model'] = $arg;
@@ -76,8 +76,7 @@  discard block
 block discarded – undo
76 76
 
77 77
         if ($search_string === false) {
78 78
             return ($config['paginate'] !== false) ?
79
-            $config['query']->paginate($config['paginate']) :
80
-            $config['query']->get();
79
+            $config['query']->paginate($config['paginate']) : $config['query']->get();
81 80
         }
82 81
 
83 82
         $textColumnTypes = ['string', 'json_string', 'text', 'longText', 'json_array'];
@@ -88,8 +87,8 @@  discard block
 block discarded – undo
88 87
         // .... 'query' => function($model) { return $model->where('active', 1); }
89 88
         // So it reads: SELECT ... WHERE active = 1 AND (XXX = x OR YYY = y) and not SELECT ... WHERE active = 1 AND XXX = x OR YYY = y;
90 89
 
91
-        if (! empty($config['query']->getQuery()->wheres)) {
92
-            $config['query'] = $config['query']->where(function ($query) use ($model_instance, $config, $search_string, $textColumnTypes) {
90
+        if (!empty($config['query']->getQuery()->wheres)) {
91
+            $config['query'] = $config['query']->where(function($query) use ($model_instance, $config, $search_string, $textColumnTypes) {
93 92
                 foreach ((array) $config['searchable_attributes'] as $k => $searchColumn) {
94 93
                     $operation = ($k == 0) ? 'where' : 'orWhere';
95 94
                     $columnType = $model_instance->getColumnType($searchColumn);
@@ -118,7 +117,6 @@  discard block
 block discarded – undo
118 117
 
119 118
         // return the results with or without pagination
120 119
         return ($config['paginate'] !== false) ?
121
-                    $config['query']->paginate($config['paginate']) :
122
-                    $config['query']->get();
120
+                    $config['query']->paginate($config['paginate']) : $config['query']->get();
123 121
     }
124 122
 }
Please login to merge, or discard this patch.