Completed
Pull Request — master (#3065)
by
unknown
02:22
created
src/Form/Field/HasMany.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,6 @@
 block discarded – undo
9 9
 use Illuminate\Database\Eloquent\Relations\HasMany as Relation;
10 10
 use Illuminate\Database\Eloquent\Relations\MorphMany;
11 11
 use Illuminate\Support\Facades\Validator;
12
-use Illuminate\Support\Str;
13 12
 
14 13
 if (!function_exists('Encore\Admin\Form\Field\array_key_attach_str')) {
15 14
     function array_key_attach_str(array $a, string $b, string $c = '.')
Please login to merge, or discard this patch.
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
     {
17 17
         return call_user_func_array(
18 18
             'array_merge',
19
-            array_map(function ($u, $v) use ($b, $c) {
19
+            array_map(function($u, $v) use ($b, $c) {
20 20
                 return ["{$b}{$c}{$u}" => $v];
21 21
             }, array_keys($a), array_values($a))
22 22
         );
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 if (!function_exists('Encore\Admin\Form\Field\array_key_clean')) {
49 49
     function array_key_clean(array $a)
50 50
     {
51
-        $a = count($a) ? call_user_func_array('array_merge', array_map(function ($k, $v) {
51
+        $a = count($a) ? call_user_func_array('array_merge', array_map(function($k, $v) {
52 52
             return [str_replace(':', '', $k) => $v];
53 53
         }, array_keys($a), array_values($a))) : $a;
54 54
 
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
         $rel = $this->relationName;
153 153
         $rules = $attributes = $messages = $newInputs = [];
154 154
         // remove all inputs & keys marked as removed
155
-        $availInput = array_filter(array_map(function ($v) {
155
+        $availInput = array_filter(array_map(function($v) {
156 156
             return $v[NestedForm::REMOVE_FLAG_NAME] ? null : $v;
157 157
         }, $input[$rel]));
158 158
         $keys = array_keys($availInput);
@@ -179,15 +179,15 @@  discard block
 block discarded – undo
179 179
                 }
180 180
             }
181 181
 
182
-            $newColumn = call_user_func_array('array_merge', array_map(function ($u) use ($columns, $rel) {
183
-                return array_map(function ($k, $v) use ($u, $rel) {
182
+            $newColumn = call_user_func_array('array_merge', array_map(function($u) use ($columns, $rel) {
183
+                return array_map(function($k, $v) use ($u, $rel) {
184 184
                     //Fix ResetInput Function! A Headache Implementation!
185 185
                     return $k ? "{$rel}.{$u}.{$v}:{$k}" : "{$rel}.{$u}.{$v}";
186 186
                 }, array_keys($columns), array_values($columns));
187 187
             }, $keys));
188 188
 
189 189
             if ($field instanceof Field\Embeds) {
190
-                $newRules = array_map(function ($v) use ($availInput, $field) {
190
+                $newRules = array_map(function($v) use ($availInput, $field) {
191 191
                     list($r, $k, $c) = explode('.', $v);
192 192
                     $v = "{$r}.{$k}";
193 193
                     $embed = $field->getValidationRules([$field->column() => $availInput[$k][$c]]);
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
                 }, $newColumn);
197 197
                 $rules = array_clean_merge($rules, array_filter($newRules));
198 198
 
199
-                $newAttributes = array_map(function ($v) use ($availInput, $field) {
199
+                $newAttributes = array_map(function($v) use ($availInput, $field) {
200 200
                     list($r, $k, $c) = explode('.', $v);
201 201
                     $v = "{$r}.{$k}";
202 202
                     $embed = $field->getValidationAttributes([$field->column() => $availInput[$k][$c]]);
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
                 }, $newColumn);
206 206
                 $attributes = array_clean_merge($attributes, array_filter($newAttributes));
207 207
 
208
-                $newInput = array_map(function ($v) use ($availInput, $field) {
208
+                $newInput = array_map(function($v) use ($availInput, $field) {
209 209
                     list($r, $k, $c) = explode('.', $v);
210 210
                     $v = "{$r}.{$k}";
211 211
                     $embed = $field->getValidationInput([$field->column() => $availInput[$k][$c]]);
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
                 }, $newColumn);
215 215
                 $newInputs = array_clean_merge($newInputs, array_filter($newInput, 'strlen', ARRAY_FILTER_USE_KEY));
216 216
 
217
-                $newMessages = array_map(function ($v) use ($availInput, $field) {
217
+                $newMessages = array_map(function($v) use ($availInput, $field) {
218 218
                     list($r, $k, $c) = explode('.', $v);
219 219
                     $v = "{$r}.{$k}";
220 220
                     $embed = $field->getValidationMessages([$field->column() => $availInput[$k][$c]]);
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
                 $messages = array_clean_merge($messages, array_filter($newMessages));
225 225
             } else {
226 226
                 $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules;
227
-                $newRules = array_map(function ($v) use ($fieldRules, $availInput) {
227
+                $newRules = array_map(function($v) use ($fieldRules, $availInput) {
228 228
                     list($r, $k, $c) = explode('.', $v);
229 229
                     //Fix ResetInput Function! A Headache Implementation!
230 230
                     $col = explode(':', $c)[0];
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
                 }, $newColumn);
237 237
                 $rules = array_clean_merge($rules, $newRules);
238 238
 
239
-                $newInput = array_map(function ($v) use ($availInput) {
239
+                $newInput = array_map(function($v) use ($availInput) {
240 240
                     list($r, $k, $c) = explode('.', $v);
241 241
                     //Fix ResetInput Function! A Headache Implementation!
242 242
                     $col = explode(':', $c)[0];
@@ -252,15 +252,15 @@  discard block
 block discarded – undo
252 252
                 }, $newColumn);
253 253
                 $newInputs = array_clean_merge($newInputs, $newInput);
254 254
 
255
-                $newAttributes = array_map(function ($v) use ($field, $availInput) {
255
+                $newAttributes = array_map(function($v) use ($field, $availInput) {
256 256
                     list($r, $k, $c) = explode('.', $v);
257 257
                     //Fix ResetInput Function! A Headache Implementation!
258 258
                     $col = explode(':', $c)[0];
259 259
                     if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) {
260
-                        return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field) {
260
+                        return call_user_func_array('array_merge', array_map(function($u) use ($v, $field) {
261 261
                             $w = $field->label();
262 262
                             //Fix ResetInput Function! A Headache Implementation!
263
-                            $w .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[2])[0] . ']' : '';
263
+                            $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : '';
264 264
 
265 265
                             return ["{$v}:{$u}" => $w];
266 266
                         }, array_keys($availInput[$k][$col])));
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
 
269 269
                     $w = $field->label();
270 270
                     //Fix ResetInput Function! A Headache Implementation!
271
-                    $w .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[2])[0] . ']' : '';
271
+                    $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : '';
272 272
 
273 273
                     return [$v => $w];
274 274
                 }, $newColumn);
@@ -276,12 +276,12 @@  discard block
 block discarded – undo
276 276
             }
277 277
 
278 278
             if ($field->validationMessages) {
279
-                $newMessages = array_map(function ($v) use ($field, $availInput) {
279
+                $newMessages = array_map(function($v) use ($field, $availInput) {
280 280
                     list($r, $k, $c) = explode('.', $v);
281 281
                     //Fix ResetInput Function! A Headache Implementation!
282 282
                     $col = explode(':', $c)[0];
283 283
                     if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) {
284
-                        return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field) {
284
+                        return call_user_func_array('array_merge', array_map(function($u) use ($v, $field) {
285 285
                             return array_key_attach_str($field->validationMessages, "{$v}:{$u}");
286 286
                         }, array_keys($availInput[$k][$col])));
287 287
                     }
@@ -458,7 +458,7 @@  discard block
 block discarded – undo
458 458
      */
459 459
     protected function setupScript($script)
460 460
     {
461
-        $method = 'setupScriptFor' . ucfirst($this->viewMode) . 'View';
461
+        $method = 'setupScriptFor'.ucfirst($this->viewMode).'View';
462 462
 
463 463
         call_user_func([$this, $method], $script);
464 464
     }
@@ -690,14 +690,14 @@  discard block
 block discarded – undo
690 690
         }
691 691
 
692 692
         /* Build row elements */
693
-        $template = array_reduce($fields, function ($all, $field) {
693
+        $template = array_reduce($fields, function($all, $field) {
694 694
             $all .= "<td>{$field}</td>";
695 695
 
696 696
             return $all;
697 697
         }, '');
698 698
 
699 699
         /* Build cell with hidden elements */
700
-        $template .= '<td class="hidden">' . implode('', $hidden) . '</td>';
700
+        $template .= '<td class="hidden">'.implode('', $hidden).'</td>';
701 701
 
702 702
         $this->setupScript(implode("\r\n", $scripts));
703 703
 
Please login to merge, or discard this patch.
src/Form/Field/Embeds.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
     {
12 12
         return call_user_func_array(
13 13
             'array_merge',
14
-            array_map(function ($u, $v) use ($b, $c) {
14
+            array_map(function($u, $v) use ($b, $c) {
15 15
                 return ["{$b}{$c}{$u}" => $v];
16 16
             }, array_keys($a), array_values($a))
17 17
         );
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 if (!function_exists('array_key_clean')) {
44 44
     function array_key_clean(array $a)
45 45
     {
46
-        $a = count($a) ? call_user_func_array('array_merge', array_map(function ($k, $v) {
46
+        $a = count($a) ? call_user_func_array('array_merge', array_map(function($k, $v) {
47 47
             return [str_replace(':', '', $k) => $v];
48 48
         }, array_keys($a), array_values($a))) : $a;
49 49
 
@@ -156,13 +156,13 @@  discard block
 block discarded – undo
156 156
              *      'extra.end_atend'     => "$label[end_at]"
157 157
              * ]
158 158
              */
159
-            $newColumn = array_map(function ($k, $v) use ($rel) {
159
+            $newColumn = array_map(function($k, $v) use ($rel) {
160 160
                 //Fix ResetInput Function! A Headache Implementation!
161 161
                 return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}";
162 162
             }, array_keys($columns), array_values($columns));
163 163
 
164 164
             $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules;
165
-            $newRules = array_map(function ($v) use ($fieldRules, $availInput) {
165
+            $newRules = array_map(function($v) use ($fieldRules, $availInput) {
166 166
                 list($k, $c) = explode('.', $v);
167 167
                 //Fix ResetInput Function! A Headache Implementation!
168 168
                 $col = explode(':', $c)[0];
@@ -243,20 +243,20 @@  discard block
 block discarded – undo
243 243
              *      'extra.end_atend'     => "$label[end_at]"
244 244
              * ]
245 245
              */
246
-            $newColumn = array_map(function ($k, $v) use ($rel) {
246
+            $newColumn = array_map(function($k, $v) use ($rel) {
247 247
                 //Fix ResetInput Function! A Headache Implementation!
248 248
                 return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}";
249 249
             }, array_keys($columns), array_values($columns));
250 250
 
251
-            $newAttributes = array_map(function ($v) use ($field, $availInput) {
251
+            $newAttributes = array_map(function($v) use ($field, $availInput) {
252 252
                 list($k, $c) = explode('.', $v);
253 253
                 //Fix ResetInput Function! A Headache Implementation!
254 254
                 $col = explode(':', $c)[0];
255 255
                 if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) {
256
-                    return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field) {
256
+                    return call_user_func_array('array_merge', array_map(function($u) use ($v, $field) {
257 257
                         $w = $field->label();
258 258
                         //Fix ResetInput Function! A Headache Implementation!
259
-                        $w .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[2])[0] . ']' : '';
259
+                        $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : '';
260 260
 
261 261
                         return ["{$v}:{$u}" => $w];
262 262
                     }, array_keys($availInput[$k][$col])));
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
                 //May Have Problem in Dealing with File Upload in Edit Mode
266 266
                 $w = $field->label();
267 267
                 //Fix ResetInput Function! A Headache Implementation!
268
-                $w .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[2])[0] . ']' : '';
268
+                $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : '';
269 269
 
270 270
                 return [$v => $w];
271 271
             }, $newColumn);
@@ -332,12 +332,12 @@  discard block
 block discarded – undo
332 332
              *     'extra.end_atend' => $value
333 333
              * ]
334 334
              */
335
-            $newColumn = array_map(function ($k, $v) use ($rel) {
335
+            $newColumn = array_map(function($k, $v) use ($rel) {
336 336
                 //Fix ResetInput Function! A Headache Implementation!
337 337
                 return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}";
338 338
             }, array_keys($columns), array_values($columns));
339 339
 
340
-            $newInput = array_map(function ($v) use ($availInput) {
340
+            $newInput = array_map(function($v) use ($availInput) {
341 341
                 list($k, $c) = explode('.', $v);
342 342
                 //Fix ResetInput Function! A Headache Implementation!
343 343
                 $col = explode(':', $c)[0];
@@ -395,20 +395,20 @@  discard block
 block discarded – undo
395 395
                 $availInput[$column] = $availInput[$column] ?: null;
396 396
             }
397 397
 
398
-            $newColumn = array_map(function ($k, $v) use ($rel) {
398
+            $newColumn = array_map(function($k, $v) use ($rel) {
399 399
                 //Fix ResetInput Function! A Headache Implementation!
400 400
                 return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}";
401 401
             }, array_keys($columns), array_values($columns));
402 402
 
403 403
             if ($field->validationMessages) {
404
-                $newMessages = array_map(function ($v) use ($field, $availInput) {
404
+                $newMessages = array_map(function($v) use ($field, $availInput) {
405 405
                     list($k, $c) = explode('.', $v);
406 406
                     //Fix ResetInput Function! A Headache Implementation!
407 407
                     $col = explode(':', $c)[0];
408 408
                     if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) {
409 409
                         return call_user_func_array(
410 410
                             'array_merge',
411
-                            array_map(function ($u) use (
411
+                            array_map(function($u) use (
412 412
                                 $v,
413 413
                                 $field
414 414
                             ) {
@@ -476,7 +476,7 @@  discard block
 block discarded – undo
476 476
             return json_decode($this->value, true);
477 477
         }
478 478
 
479
-        return (array)$this->value;
479
+        return (array) $this->value;
480 480
     }
481 481
 
482 482
     /**
@@ -495,7 +495,7 @@  discard block
 block discarded – undo
495 495
         //Fix the Bug of Embeds Fields Cannot be used within HasMany
496 496
         if ($this->elementName) {
497 497
             list($rel, $key, $col) = explode('.', $this->errorKey);
498
-            $form->fields()->each(function (Field $field) use ($rel, $key, $col) {
498
+            $form->fields()->each(function(Field $field) use ($rel, $key, $col) {
499 499
                 $column = $field->column();
500 500
                 $elementName = $elementClass = $errorKey = [];
501 501
                 if (is_array($column)) {
Please login to merge, or discard this patch.