Completed
Pull Request — master (#3039)
by
unknown
03:46
created
src/Controllers/LogController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -35,14 +35,14 @@  discard block
 block discarded – undo
35 35
 
36 36
         $grid->id('ID')->sortable();
37 37
         $grid->user()->name('User');
38
-        $grid->method()->display(function ($method) {
38
+        $grid->method()->display(function($method) {
39 39
             $color = array_get(OperationLog::$methodColors, $method, 'grey');
40 40
 
41 41
             return "<span class=\"badge bg-$color\">$method</span>";
42 42
         });
43 43
         $grid->path()->label('info');
44 44
         $grid->ip()->label('primary');
45
-        $grid->input()->display(function ($input) {
45
+        $grid->input()->display(function($input) {
46 46
             $input = json_decode($input, true);
47 47
             $input = array_except($input, ['_pjax', '_token', '_method', '_previous_']);
48 48
             if (empty($input)) {
@@ -54,14 +54,14 @@  discard block
 block discarded – undo
54 54
 
55 55
         $grid->created_at(trans('admin.created_at'));
56 56
 
57
-        $grid->actions(function (Grid\Displayers\Actions $actions) {
57
+        $grid->actions(function(Grid\Displayers\Actions $actions) {
58 58
             $actions->disableEdit();
59 59
             $actions->disableView();
60 60
         });
61 61
 
62 62
         $grid->disableCreation();
63 63
 
64
-        $grid->filter(function ($filter) {
64
+        $grid->filter(function($filter) {
65 65
             $userModel = config('admin.database.users_model');
66 66
 
67 67
             $filter->equal('user_id', 'User')->select($userModel::all()->pluck('name', 'id'));
Please login to merge, or discard this patch.
src/Admin.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -213,10 +213,10 @@
 block discarded – undo
213 213
             'middleware' => config('admin.route.middleware'),
214 214
         ];
215 215
 
216
-        app('router')->group($attributes, function ($router) {
216
+        app('router')->group($attributes, function($router) {
217 217
 
218 218
             /* @var \Illuminate\Routing\Router $router */
219
-            $router->namespace('Encore\Admin\Controllers')->group(function ($router) {
219
+            $router->namespace('Encore\Admin\Controllers')->group(function($router) {
220 220
 
221 221
                 /* @var \Illuminate\Routing\Router $router */
222 222
                 $router->resource('auth/users', 'UserController');
Please login to merge, or discard this patch.
src/Grid/Displayers/Image.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
             $this->value = $this->value->toArray();
14 14
         }
15 15
 
16
-        return collect((array) $this->value)->filter()->map(function ($path) use ($server, $width, $height) {
16
+        return collect((array) $this->value)->filter()->map(function($path) use ($server, $width, $height) {
17 17
             if (url()->isValidUrl($path) || strpos($path, 'data:image') === 0) {
18 18
                 $src = $path;
19 19
             } elseif ($server) {
Please login to merge, or discard this patch.
src/Form/Field/UploadField.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
             'browseLabel'          => trans('admin.browse'),
80 80
             'showRemove'           => false,
81 81
             'showUpload'           => false,
82
-            'dropZoneEnabled'      => false,        //dropzone disabled by default for backward compatibility
82
+            'dropZoneEnabled'      => false, //dropzone disabled by default for backward compatibility
83 83
 //            'initialCaption'       => $this->initialCaption($this->value),
84 84
             'deleteExtraData'      => [
85 85
                 $this->formatName($this->column) => static::FILE_DELETE_FLAG,
Please login to merge, or discard this patch.
src/Grid/Filter.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
      */
260 260
     protected function removeFilterByID($id)
261 261
     {
262
-        $this->filters = array_filter($this->filters, function (AbstractFilter $filter) use ($id) {
262
+        $this->filters = array_filter($this->filters, function(AbstractFilter $filter) use ($id) {
263 263
             return $filter->getId() != $id;
264 264
         });
265 265
     }
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
     {
274 274
         $inputs = array_dot(Input::all());
275 275
 
276
-        $inputs = array_filter($inputs, function ($input) {
276
+        $inputs = array_filter($inputs, function($input) {
277 277
             return $input !== '' && !is_null($input);
278 278
         });
279 279
 
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
             }
302 302
         }
303 303
 
304
-        return tap(array_filter($conditions), function ($conditions) {
304
+        return tap(array_filter($conditions), function($conditions) {
305 305
             if (!empty($conditions)) {
306 306
                 $this->expand();
307 307
             }
@@ -319,9 +319,9 @@  discard block
 block discarded – undo
319 319
             return $inputs;
320 320
         }
321 321
 
322
-        $inputs = collect($inputs)->filter(function ($input, $key) {
322
+        $inputs = collect($inputs)->filter(function($input, $key) {
323 323
             return starts_with($key, "{$this->name}_");
324
-        })->mapWithKeys(function ($val, $key) {
324
+        })->mapWithKeys(function($val, $key) {
325 325
             $key = str_replace("{$this->name}_", '', $key);
326 326
 
327 327
             return [$key => $val];
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
      */
392 392
     public function scope($key, $label = '')
393 393
     {
394
-        return tap(new Scope($key, $label), function (Scope $scope) {
394
+        return tap(new Scope($key, $label), function(Scope $scope) {
395 395
             return $this->scopes->push($scope);
396 396
         });
397 397
     }
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
     {
416 416
         $key = request(Scope::QUERY_NAME);
417 417
 
418
-        return $this->scopes->first(function ($scope) use ($key) {
418
+        return $this->scopes->first(function($scope) use ($key) {
419 419
             return $scope->key == $key;
420 420
         });
421 421
     }
@@ -535,9 +535,9 @@  discard block
 block discarded – undo
535 535
 
536 536
         $columns->push($pageKey);
537 537
 
538
-        $groupNames = collect($this->filters)->filter(function ($filter) {
538
+        $groupNames = collect($this->filters)->filter(function($filter) {
539 539
             return $filter instanceof Group;
540
-        })->map(function (AbstractFilter $filter) {
540
+        })->map(function(AbstractFilter $filter) {
541 541
             return "{$filter->getId()}_group";
542 542
         });
543 543
 
Please login to merge, or discard this patch.
src/Grid/Displayers/Editable.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -184,7 +184,7 @@
 block discarded – undo
184 184
             $attributes = array_merge($attributes, $this->attributes);
185 185
         }
186 186
 
187
-        $attributes = collect($attributes)->map(function ($attribute, $name) {
187
+        $attributes = collect($attributes)->map(function($attribute, $name) {
188 188
             return "$name='$attribute'";
189 189
         })->implode(' ');
190 190
 
Please login to merge, or discard this patch.
resources/views/partials/exception.blade.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 @if($errors->hasBag('exception') && env('APP_DEBUG') == true)
2
-    <?php $error = $errors->getBag('exception');?>
2
+    <?php $error = $errors->getBag('exception'); ?>
3 3
     <div class="alert alert-warning alert-dismissable">
4 4
         <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
5 5
         <h4>
Please login to merge, or discard this patch.
src/Console/ExportSeedCommand.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -174,7 +174,7 @@
 block discarded – undo
174 174
     /**
175 175
      * Get stub contents.
176 176
      *
177
-     * @param $name
177
+     * @param string $name
178 178
      *
179 179
      * @return string
180 180
      */
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@
 block discarded – undo
89 89
         $fields = \DB::getSchemaBuilder()->getColumnListing($table);
90 90
         $fields = array_diff($fields, $exceptFields);
91 91
 
92
-        $array = \DB::table($table)->get($fields)->map(function ($item) {
92
+        $array = \DB::table($table)->get($fields)->map(function($item) {
93 93
             return (array) $item;
94 94
         })->all();
95 95
 
Please login to merge, or discard this patch.
src/Form/Field/HasMany.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
     {
16 16
         return call_user_func_array(
17 17
             'array_merge',
18
-            array_map(function ($u, $v) use ($b, $c) {
18
+            array_map(function($u, $v) use ($b, $c) {
19 19
                 return ["{$b}{$c}{$u}" => $v];
20 20
             }, array_keys($a), array_values($a))
21 21
         );
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 if (!function_exists('Encore\Admin\Form\Field\array_key_clean')) {
48 48
     function array_key_clean(array $a)
49 49
     {
50
-        $a = count($a) ? call_user_func_array('array_merge', array_map(function ($k, $v) {
50
+        $a = count($a) ? call_user_func_array('array_merge', array_map(function($k, $v) {
51 51
             return [str_replace(':', '', $k) => $v];
52 52
         }, array_keys($a), array_values($a))) : $a;
53 53
 
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
         $rel = $this->relationName;
152 152
         $rules = $attributes = $messages = $newInputs = [];
153 153
         // remove all inputs & keys marked as removed
154
-        $availInput = array_filter(array_map(function ($v) {
154
+        $availInput = array_filter(array_map(function($v) {
155 155
             return $v[NestedForm::REMOVE_FLAG_NAME] ? null : $v;
156 156
         }, $input[$rel]));
157 157
         $keys = array_keys($availInput);
@@ -178,15 +178,15 @@  discard block
 block discarded – undo
178 178
                 }
179 179
             }
180 180
 
181
-            $newColumn = call_user_func_array('array_merge', array_map(function ($u) use ($columns, $rel) {
182
-                return array_map(function ($k, $v) use ($u, $rel) {
181
+            $newColumn = call_user_func_array('array_merge', array_map(function($u) use ($columns, $rel) {
182
+                return array_map(function($k, $v) use ($u, $rel) {
183 183
                     //Fix ResetInput Function! A Headache Implementation!
184 184
                     return $k ? "{$rel}.{$u}.{$v}:{$k}" : "{$rel}.{$u}.{$v}";
185 185
                 }, array_keys($columns), array_values($columns));
186 186
             }, $keys));
187 187
 
188 188
             if ($field instanceof Field\Embeds) {
189
-                $newRules = array_map(function ($v) use ($availInput, $field) {
189
+                $newRules = array_map(function($v) use ($availInput, $field) {
190 190
                     list($r, $k, $c) = explode('.', $v);
191 191
                     $v = "{$r}.{$k}";
192 192
                     $embed = $field->getValidationRules([$field->column() => $availInput[$k][$c]]);
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
                 }, $newColumn);
196 196
                 $rules = array_clean_merge($rules, array_filter($newRules));
197 197
 
198
-                $newAttributes = array_map(function ($v) use ($availInput, $field) {
198
+                $newAttributes = array_map(function($v) use ($availInput, $field) {
199 199
                     list($r, $k, $c) = explode('.', $v);
200 200
                     $v = "{$r}.{$k}";
201 201
                     $embed = $field->getValidationAttributes([$field->column() => $availInput[$k][$c]]);
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
                 }, $newColumn);
205 205
                 $attributes = array_clean_merge($attributes, array_filter($newAttributes));
206 206
 
207
-                $newInput = array_map(function ($v) use ($availInput, $field) {
207
+                $newInput = array_map(function($v) use ($availInput, $field) {
208 208
                     list($r, $k, $c) = explode('.', $v);
209 209
                     $v = "{$r}.{$k}";
210 210
                     $embed = $field->getValidationInput([$field->column() => $availInput[$k][$c]]);
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
                 }, $newColumn);
214 214
                 $newInputs = array_clean_merge($newInputs, array_filter($newInput, 'strlen', ARRAY_FILTER_USE_KEY));
215 215
 
216
-                $newMessages = array_map(function ($v) use ($availInput, $field) {
216
+                $newMessages = array_map(function($v) use ($availInput, $field) {
217 217
                     list($r, $k, $c) = explode('.', $v);
218 218
                     $v = "{$r}.{$k}";
219 219
                     $embed = $field->getValidationMessages([$field->column() => $availInput[$k][$c]]);
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
                 $messages = array_clean_merge($messages, array_filter($newMessages));
224 224
             } else {
225 225
                 $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules;
226
-                $newRules = array_map(function ($v) use ($fieldRules, $availInput) {
226
+                $newRules = array_map(function($v) use ($fieldRules, $availInput) {
227 227
                     list($r, $k, $c) = explode('.', $v);
228 228
                     //Fix ResetInput Function! A Headache Implementation!
229 229
                     $col = explode(':', $c)[0];
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
                 }, $newColumn);
236 236
                 $rules = array_clean_merge($rules, $newRules);
237 237
 
238
-                $newInput = array_map(function ($v) use ($availInput) {
238
+                $newInput = array_map(function($v) use ($availInput) {
239 239
                     list($r, $k, $c) = explode('.', $v);
240 240
                     //Fix ResetInput Function! A Headache Implementation!
241 241
                     $col = explode(':', $c)[0];
@@ -251,12 +251,12 @@  discard block
 block discarded – undo
251 251
                 }, $newColumn);
252 252
                 $newInputs = array_clean_merge($newInputs, $newInput);
253 253
 
254
-                $newAttributes = array_map(function ($v) use ($field, $availInput) {
254
+                $newAttributes = array_map(function($v) use ($field, $availInput) {
255 255
                     list($r, $k, $c) = explode('.', $v);
256 256
                     //Fix ResetInput Function! A Headache Implementation!
257 257
                     $col = explode(':', $c)[0];
258 258
                     if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) {
259
-                        return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field) {
259
+                        return call_user_func_array('array_merge', array_map(function($u) use ($v, $field) {
260 260
                             $w = $field->label();
261 261
                             //Fix ResetInput Function! A Headache Implementation!
262 262
                             $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : '';
@@ -275,12 +275,12 @@  discard block
 block discarded – undo
275 275
             }
276 276
 
277 277
             if ($field->validationMessages) {
278
-                $newMessages = array_map(function ($v) use ($field, $availInput) {
278
+                $newMessages = array_map(function($v) use ($field, $availInput) {
279 279
                     list($r, $k, $c) = explode('.', $v);
280 280
                     //Fix ResetInput Function! A Headache Implementation!
281 281
                     $col = explode(':', $c)[0];
282 282
                     if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) {
283
-                        return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field) {
283
+                        return call_user_func_array('array_merge', array_map(function($u) use ($v, $field) {
284 284
                             return array_key_attach_str($field->validationMessages, "{$v}:{$u}");
285 285
                         }, array_keys($availInput[$k][$col])));
286 286
                     }
@@ -688,7 +688,7 @@  discard block
 block discarded – undo
688 688
         }
689 689
 
690 690
         /* Build row elements */
691
-        $template = array_reduce($fields, function ($all, $field) {
691
+        $template = array_reduce($fields, function($all, $field) {
692 692
             $all .= "<td>{$field}</td>";
693 693
 
694 694
             return $all;
Please login to merge, or discard this patch.