Completed
Pull Request — master (#3200)
by Panda
02:20
created
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.
src/Console/ExportSeedCommand.php 1 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   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -640,7 +640,7 @@
 block discarded – undo
640 640
         }
641 641
 
642 642
         /* Build row elements */
643
-        $template = array_reduce($fields, function ($all, $field) {
643
+        $template = array_reduce($fields, function($all, $field) {
644 644
             $all .= "<td>{$field}</td>";
645 645
 
646 646
             return $all;
Please login to merge, or discard this patch.
src/Form/Field.php 3 patches
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -473,11 +473,15 @@
 block discarded – undo
473 473
             $thisRuleArr = array_filter(explode('|', $this->rules));
474 474
 
475 475
             $this->rules = array_merge($thisRuleArr, $rules);
476
-            if (in_array('required', $this->rules)) $this->required();
476
+            if (in_array('required', $this->rules)) {
477
+                $this->required();
478
+            }
477 479
         } elseif (is_string($rules)) {
478 480
             $rules = array_filter(explode('|', "{$this->rules}|$rules"));
479 481
 
480
-            if (in_array('required', $rules)) $this->required();
482
+            if (in_array('required', $rules)) {
483
+                $this->required();
484
+            }
481 485
             $this->rules = implode('|', $rules);
482 486
         }
483 487
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1024,7 +1024,7 @@
 block discarded – undo
1024 1024
     protected function getGroupClass($default = false)
1025 1025
     : string
1026 1026
     {
1027
-        return ($default ? 'form-group ' : '') . implode(' ', array_filter($this->groupClass));
1027
+        return ($default ? 'form-group ' : '').implode(' ', array_filter($this->groupClass));
1028 1028
     }
1029 1029
 
1030 1030
     /**
Please login to merge, or discard this patch.
Doc Comments   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
     /**
228 228
      * Field constructor.
229 229
      *
230
-     * @param       $column
230
+     * @param       string $column
231 231
      * @param array $arguments
232 232
      */
233 233
     public function __construct($column, $arguments = [])
@@ -563,7 +563,7 @@  discard block
 block discarded – undo
563 563
     /**
564 564
      * Set or get value of the field.
565 565
      *
566
-     * @param null $value
566
+     * @param string $value
567 567
      *
568 568
      * @return mixed
569 569
      */
@@ -734,7 +734,7 @@  discard block
 block discarded – undo
734 734
     /**
735 735
      * Add html attributes to elements.
736 736
      *
737
-     * @param array|string $attribute
737
+     * @param string $attribute
738 738
      * @param mixed        $value
739 739
      *
740 740
      * @return $this
@@ -1020,7 +1020,7 @@  discard block
 block discarded – undo
1020 1020
     /**
1021 1021
      * Get element class.
1022 1022
      *
1023
-     * @return array
1023
+     * @return string
1024 1024
      */
1025 1025
     protected function getGroupClass($default = false)
1026 1026
     : string
@@ -1069,7 +1069,7 @@  discard block
 block discarded – undo
1069 1069
     }
1070 1070
 
1071 1071
     /**
1072
-     * @param array $labelClass
1072
+     * @param string[] $labelClass
1073 1073
      *
1074 1074
      * @return self
1075 1075
      */
@@ -1122,7 +1122,7 @@  discard block
 block discarded – undo
1122 1122
     /**
1123 1123
      * Set view of current field.
1124 1124
      *
1125
-     * @return string
1125
+     * @return Field
1126 1126
      */
1127 1127
     public function setView($view)
1128 1128
     {
Please login to merge, or discard this patch.
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.