Completed
Pull Request — master (#3073)
by
unknown
02:49
created
src/Layout/Column.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@
 block discarded – undo
112 112
     protected function startColumn()
113 113
     {
114 114
         // get class name using width array
115
-        $classnName = collect($this->width)->map(function ($value, $key) {
115
+        $classnName = collect($this->width)->map(function($value, $key) {
116 116
             return "col-$key-$value";
117 117
         })->implode(' ');
118 118
 
Please login to merge, or discard this patch.
src/Form/Field.php 1 patch
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
     /**
223 223
      * Field constructor.
224 224
      *
225
-     * @param       $column
225
+     * @param       string $column
226 226
      * @param array $arguments
227 227
      */
228 228
     public function __construct($column, $arguments = [])
@@ -556,7 +556,7 @@  discard block
 block discarded – undo
556 556
     /**
557 557
      * Set or get value of the field.
558 558
      *
559
-     * @param null $value
559
+     * @param string $value
560 560
      *
561 561
      * @return mixed
562 562
      */
@@ -727,7 +727,7 @@  discard block
 block discarded – undo
727 727
     /**
728 728
      * Add html attributes to elements.
729 729
      *
730
-     * @param array|string $attribute
730
+     * @param string $attribute
731 731
      * @param mixed        $value
732 732
      *
733 733
      * @return $this
@@ -1019,7 +1019,7 @@  discard block
 block discarded – undo
1019 1019
     }
1020 1020
 
1021 1021
     /**
1022
-     * @param array $labelClass
1022
+     * @param string[] $labelClass
1023 1023
      *
1024 1024
      * @return self
1025 1025
      */
@@ -1072,7 +1072,7 @@  discard block
 block discarded – undo
1072 1072
     /**
1073 1073
      * Set view of current field.
1074 1074
      *
1075
-     * @return string
1075
+     * @return Field
1076 1076
      */
1077 1077
     public function setView($view)
1078 1078
     {
Please login to merge, or discard this patch.
src/Grid/Tools/ColumnSelector.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 
39 39
         $this->setupScript($show, $columns);
40 40
 
41
-        $lists = $columns->map(function ($val, $key) use ($show) {
41
+        $lists = $columns->map(function($val, $key) use ($show) {
42 42
             if (empty($show)) {
43 43
                 $checked = 'checked';
44 44
             } else {
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
      */
74 74
     protected function getGridColumns()
75 75
     {
76
-        return $this->grid->columns()->map(function (Grid\Column $column) {
76
+        return $this->grid->columns()->map(function(Grid\Column $column) {
77 77
             $name = $column->getName();
78 78
 
79 79
             if (in_array($name, ['__row_selector__', '__actions__'])) {
Please login to merge, or discard this patch.
src/Grid.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
 
372 372
         array_push($visible, '__row_selector__', '__actions__');
373 373
 
374
-        return $this->columns->filter(function (Column $column) use ($visible) {
374
+        return $this->columns->filter(function(Column $column) use ($visible) {
375 375
             return in_array($column->getName(), $visible);
376 376
         });
377 377
     }
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
 
392 392
         array_push($visible, '__row_selector__', '__actions__');
393 393
 
394
-        return collect($this->columnNames)->filter(function ($column) use ($visible) {
394
+        return collect($this->columnNames)->filter(function($column) use ($visible) {
395 395
             return in_array($column, $visible);
396 396
         });
397 397
     }
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
         $column = new Column($column, $label);
410 410
         $column->setGrid($this);
411 411
 
412
-        return tap($column, function ($value) {
412
+        return tap($column, function($value) {
413 413
             $this->columns->push($value);
414 414
         });
415 415
     }
@@ -427,7 +427,7 @@  discard block
 block discarded – undo
427 427
         $column = new Column($column, $label);
428 428
         $column->setGrid($this);
429 429
 
430
-        return tap($column, function ($value) {
430
+        return tap($column, function($value) {
431 431
             $this->columns->prepend($value);
432 432
         });
433 433
     }
@@ -584,7 +584,7 @@  discard block
 block discarded – undo
584 584
 
585 585
         Column::setOriginalGridModels($collection);
586 586
 
587
-        $this->columns->map(function (Column $column) use (&$data) {
587
+        $this->columns->map(function(Column $column) use (&$data) {
588 588
             $data = $column->fill($data);
589 589
 
590 590
             $this->columnNames[] = $column->getName();
@@ -688,7 +688,7 @@  discard block
 block discarded – undo
688 688
      */
689 689
     protected function buildRows(array $data)
690 690
     {
691
-        $this->rows = collect($data)->map(function ($model, $number) {
691
+        $this->rows = collect($data)->map(function($model, $number) {
692 692
             return new Row($number, $model);
693 693
         });
694 694
 
Please login to merge, or discard this patch.
Doc Comments   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
      * Get or set option for grid.
277 277
      *
278 278
      * @param string $key
279
-     * @param mixed  $value
279
+     * @param boolean  $value
280 280
      *
281 281
      * @return $this|mixed
282 282
      */
@@ -466,7 +466,7 @@  discard block
 block discarded – undo
466 466
     /**
467 467
      * Get the grid paginator.
468 468
      *
469
-     * @return mixed
469
+     * @return Tools\Paginator
470 470
      */
471 471
     public function paginator()
472 472
     {
@@ -518,7 +518,7 @@  discard block
 block discarded – undo
518 518
     /**
519 519
      * Set grid action callback.
520 520
      *
521
-     * @param Closure|string $actions
521
+     * @param Closure $actions
522 522
      *
523 523
      * @return $this
524 524
      */
@@ -645,7 +645,7 @@  discard block
 block discarded – undo
645 645
      *
646 646
      * @param bool $toArray
647 647
      *
648
-     * @return array|Collection|mixed
648
+     * @return Collection
649 649
      */
650 650
     public function processFilter($toArray = true)
651 651
     {
@@ -895,7 +895,7 @@  discard block
 block discarded – undo
895 895
      *
896 896
      * @param Closure|null $closure
897 897
      *
898
-     * @return $this|Closure
898
+     * @return callable
899 899
      */
900 900
     public function header(Closure $closure = null)
901 901
     {
@@ -927,7 +927,7 @@  discard block
 block discarded – undo
927 927
      *
928 928
      * @param Closure|null $closure
929 929
      *
930
-     * @return $this|Closure
930
+     * @return callable
931 931
      */
932 932
     public function footer(Closure $closure = null)
933 933
     {
Please login to merge, or discard this patch.
src/Grid/Tools.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
      */
86 86
     public function disableFilterButton(bool $disable = true)
87 87
     {
88
-        $this->tools = $this->tools->map(function (AbstractTool $tool) use ($disable) {
88
+        $this->tools = $this->tools->map(function(AbstractTool $tool) use ($disable) {
89 89
             if ($tool instanceof FilterButton) {
90 90
                 return $tool->disable($disable);
91 91
             }
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
      */
101 101
     public function disableRefreshButton(bool $disable = true)
102 102
     {
103
-        $this->tools = $this->tools->map(function (AbstractTool $tool) use ($disable) {
103
+        $this->tools = $this->tools->map(function(AbstractTool $tool) use ($disable) {
104 104
             if ($tool instanceof RefreshButton) {
105 105
                 return $tool->disable($disable);
106 106
             }
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
      */
116 116
     public function disableBatchActions(bool $disable = true)
117 117
     {
118
-        $this->tools = $this->tools->map(function ($tool) use ($disable) {
118
+        $this->tools = $this->tools->map(function($tool) use ($disable) {
119 119
             if ($tool instanceof BatchActions) {
120 120
                 return $tool->disable($disable);
121 121
             }
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
      */
129 129
     public function batch(\Closure $closure)
130 130
     {
131
-        call_user_func($closure, $this->tools->first(function ($tool) {
131
+        call_user_func($closure, $this->tools->first(function($tool) {
132 132
             return $tool instanceof BatchActions;
133 133
         }));
134 134
     }
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
      */
141 141
     public function render()
142 142
     {
143
-        return $this->tools->map(function ($tool) {
143
+        return $this->tools->map(function($tool) {
144 144
             if ($tool instanceof AbstractTool) {
145 145
                 if (!$tool->allowed()) {
146 146
                     return '';
Please login to merge, or discard this patch.
src/Form/Field/Embeds.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,6 @@
 block discarded – undo
5 5
 use Encore\Admin\Form\EmbeddedForm;
6 6
 use Encore\Admin\Form\Field;
7 7
 use Illuminate\Support\Facades\Validator;
8
-use Illuminate\Support\Str;
9 8
 
10 9
 if (!function_exists('Encore\Admin\Form\Field\array_key_attach_str')) {
11 10
     function array_key_attach_str(array $a, string $b, string $c = '.')
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
     {
13 13
         return call_user_func_array(
14 14
             'array_merge',
15
-            array_map(function ($u, $v) use ($b, $c) {
15
+            array_map(function($u, $v) use ($b, $c) {
16 16
                 return ["{$b}{$c}{$u}" => $v];
17 17
             }, array_keys($a), array_values($a))
18 18
         );
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 if (!function_exists('Encore\Admin\Form\Field\array_key_clean')) {
45 45
     function array_key_clean(array $a)
46 46
     {
47
-        $a = count($a) ? call_user_func_array('array_merge', array_map(function ($k, $v) {
47
+        $a = count($a) ? call_user_func_array('array_merge', array_map(function($k, $v) {
48 48
             return [str_replace(':', '', $k) => $v];
49 49
         }, array_keys($a), array_values($a))) : $a;
50 50
 
@@ -157,13 +157,13 @@  discard block
 block discarded – undo
157 157
              *      'extra.end_atend'     => "$label[end_at]"
158 158
              * ]
159 159
              */
160
-            $newColumn = array_map(function ($k, $v) use ($rel) {
160
+            $newColumn = array_map(function($k, $v) use ($rel) {
161 161
                 //Fix ResetInput Function! A Headache Implementation!
162 162
                 return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}";
163 163
             }, array_keys($columns), array_values($columns));
164 164
 
165 165
             $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules;
166
-            $newRules = array_map(function ($v) use ($fieldRules, $availInput) {
166
+            $newRules = array_map(function($v) use ($fieldRules, $availInput) {
167 167
                 list($k, $c) = explode('.', $v);
168 168
                 //Fix ResetInput Function! A Headache Implementation!
169 169
                 $col = explode(':', $c)[0];
@@ -244,20 +244,20 @@  discard block
 block discarded – undo
244 244
              *      'extra.end_atend'     => "$label[end_at]"
245 245
              * ]
246 246
              */
247
-            $newColumn = array_map(function ($k, $v) use ($rel) {
247
+            $newColumn = array_map(function($k, $v) use ($rel) {
248 248
                 //Fix ResetInput Function! A Headache Implementation!
249 249
                 return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}";
250 250
             }, array_keys($columns), array_values($columns));
251 251
 
252
-            $newAttributes = array_map(function ($v) use ($field, $availInput) {
252
+            $newAttributes = array_map(function($v) use ($field, $availInput) {
253 253
                 list($k, $c) = explode('.', $v);
254 254
                 //Fix ResetInput Function! A Headache Implementation!
255 255
                 $col = explode(':', $c)[0];
256 256
                 if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) {
257
-                    return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field) {
257
+                    return call_user_func_array('array_merge', array_map(function($u) use ($v, $field) {
258 258
                         $w = $field->label();
259 259
                         //Fix ResetInput Function! A Headache Implementation!
260
-                        $w .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[2])[0] . ']' : '';
260
+                        $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : '';
261 261
 
262 262
                         return ["{$v}:{$u}" => $w];
263 263
                     }, array_keys($availInput[$k][$col])));
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
                 //May Have Problem in Dealing with File Upload in Edit Mode
267 267
                 $w = $field->label();
268 268
                 //Fix ResetInput Function! A Headache Implementation!
269
-                $w .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[2])[0] . ']' : '';
269
+                $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : '';
270 270
 
271 271
                 return [$v => $w];
272 272
             }, $newColumn);
@@ -333,12 +333,12 @@  discard block
 block discarded – undo
333 333
              *     'extra.end_atend' => $value
334 334
              * ]
335 335
              */
336
-            $newColumn = array_map(function ($k, $v) use ($rel) {
336
+            $newColumn = array_map(function($k, $v) use ($rel) {
337 337
                 //Fix ResetInput Function! A Headache Implementation!
338 338
                 return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}";
339 339
             }, array_keys($columns), array_values($columns));
340 340
 
341
-            $newInput = array_map(function ($v) use ($availInput) {
341
+            $newInput = array_map(function($v) use ($availInput) {
342 342
                 list($k, $c) = explode('.', $v);
343 343
                 //Fix ResetInput Function! A Headache Implementation!
344 344
                 $col = explode(':', $c)[0];
@@ -396,20 +396,20 @@  discard block
 block discarded – undo
396 396
                 $availInput[$column] = $availInput[$column] ?: null;
397 397
             }
398 398
 
399
-            $newColumn = array_map(function ($k, $v) use ($rel) {
399
+            $newColumn = array_map(function($k, $v) use ($rel) {
400 400
                 //Fix ResetInput Function! A Headache Implementation!
401 401
                 return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}";
402 402
             }, array_keys($columns), array_values($columns));
403 403
 
404 404
             if ($field->validationMessages) {
405
-                $newMessages = array_map(function ($v) use ($field, $availInput) {
405
+                $newMessages = array_map(function($v) use ($field, $availInput) {
406 406
                     list($k, $c) = explode('.', $v);
407 407
                     //Fix ResetInput Function! A Headache Implementation!
408 408
                     $col = explode(':', $c)[0];
409 409
                     if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) {
410 410
                         return call_user_func_array(
411 411
                             'array_merge',
412
-                            array_map(function ($u) use (
412
+                            array_map(function($u) use (
413 413
                                 $v,
414 414
                                 $field
415 415
                             ) {
@@ -477,7 +477,7 @@  discard block
 block discarded – undo
477 477
             return json_decode($this->value, true);
478 478
         }
479 479
 
480
-        return (array)$this->value;
480
+        return (array) $this->value;
481 481
     }
482 482
 
483 483
     /**
@@ -496,7 +496,7 @@  discard block
 block discarded – undo
496 496
         //Fix the Bug of Embeds Fields Cannot be used within HasMany
497 497
         if ($this->elementName) {
498 498
             list($rel, $key, $col) = explode('.', $this->errorKey);
499
-            $form->fields()->each(function (Field $field) use ($rel, $key, $col) {
499
+            $form->fields()->each(function(Field $field) use ($rel, $key, $col) {
500 500
                 $column = $field->column();
501 501
                 $elementName = $elementClass = $errorKey = [];
502 502
                 if (is_array($column)) {
Please login to merge, or discard this patch.