View GitHub Repository laravel-admin

Schedule Inspection
Subscribe
Completed
Pull Request — master (#2901)
by
unknown
02:15
created
Status
Category
Toggle Patches
src/Form/Field/Embeds.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch 
@@ -64,24 +64,24 @@  discard block
 
 block discarded – undo
64 64
65 65
66 66 
         $availInput = $input;
67 
-        $array_key_attach_str = function (array $a, string $b, string $c = '.') {
67 
+        $array_key_attach_str = function(array $a, string $b, string $c = '.') {
68 68 
             return call_user_func_array(
69 69 
                 'array_merge',
70 
-                array_map(function ($u, $v) use ($b, $c) {
70 
+                array_map(function($u, $v) use ($b, $c) {
71 71 
                     return ["{$b}{$c}{$u}" => $v];
72 72 
                 }, array_keys($a), array_values($a))
73 73 
             );
74 74 
         };
75 75
76 
-        $array_key_clean = function (array $a) {
77 
-            $a = count($a) ? call_user_func_array('array_merge', array_map(function ($k, $v) {
76 
+        $array_key_clean = function(array $a) {
77 
+            $a = count($a) ? call_user_func_array('array_merge', array_map(function($k, $v) {
78 78 
                 return [str_replace(':', '', $k) => $v];
79 79 
             }, array_keys($a), array_values($a))) : $a;
80 80
81 81 
             return $a;
82 82 
         };
83 83
84 
-        $array_key_clean_undot = function (array $a) {
84 
+        $array_key_clean_undot = function(array $a) {
85 85 
             if (count($a)) {
86 86 
                 foreach ($a as $key => $val) {
87 87 
                     array_set($a, str_replace(':', '', $key), $val);
 
@@ -103,7 +103,7 @@  discard block
 
 block discarded – undo
103 103 
             $columns = is_array($column) ? $column : [$column];
104 104 
             if ($field instanceof Field\MultipleSelect) {
105 105 
                 $availInput[$column] = array_filter($availInput[$column], 'strlen');
106 
-                $availInput[$column] = $availInput[$column] ? : null;
106 
+                $availInput[$column] = $availInput[$column] ?: null;
107 107 
             }
108 108 
             /*
109 109 
              *
 
@@ -125,7 +125,7 @@  discard block
 
 block discarded – undo
125 125 
              *     'extra.end_atend' => 'required'
126 126 
              * ]
127 127 
              */
128 
-            $newColumn = array_map(function ($k, $v) use ($rel) {
128 
+            $newColumn = array_map(function($k, $v) use ($rel) {
129 129 
                 //Fix ResetInput Function! A Headache Implementation!
130 130 
                 return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}";
131 131 
             }, array_keys($columns), array_values($columns));
 
@@ -133,22 +133,22 @@  discard block
 
 block discarded – undo
133 133 
             $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules;
134 134 
             $rules = array_merge($rules, call_user_func_array(
135 135 
                 'array_merge',
136 
-                array_map(function ($v) use ($fieldRules) {
136 
+                array_map(function($v) use ($fieldRules) {
137 137 
                     return [$v => $fieldRules];
138 138 
                 }, $newColumn)
139 139 
             ));
140 140 
             $attributes = array_merge($attributes, call_user_func_array(
141 141 
                 'array_merge',
142 
-                array_map(function ($v) use ($field) {
142 
+                array_map(function($v) use ($field) {
143 143 
                     //Fix ResetInput Function! A Headache Implementation!
144 144 
                     $u = $field->label();
145 
-                    $u .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[1])[0] . ']' : '';
145 
+                    $u .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[1])[0].']' : '';
146 146
147 147 
                     return [$v => "{$u}"];
148 148 
                 }, $newColumn)
149 149 
             ));
150 150 
             if ($field->validationMessages) {
151 
-                $newMessages = array_map(function ($v) use ($field, $availInput, $array_key_attach_str) {
151 
+                $newMessages = array_map(function($v) use ($field, $availInput, $array_key_attach_str) {
152 152 
                     list($rel, $col) = explode('.', $v);
153 153 
                     //Fix ResetInput Function! A Headache Implementation!
154 154 
                     $col1 = explode(':', $col)[0];
 
@@ -175,7 +175,7 @@  discard block
 
 block discarded – undo
175 175 
         if (empty($rules)) {
176 176 
             return false;
177 177 
         }
178 
-        $newInput = call_user_func_array('array_merge', array_map(function ($idx) use ($availInput) {
178 
+        $newInput = call_user_func_array('array_merge', array_map(function($idx) use ($availInput) {
179 179 
             list($rel, $col) = explode('.', $idx);
180 180 
             //Fix ResetInput Function! A Headache Implementation!
181 181 
             $col1 = explode(':', $col)[0];
 
@@ -183,7 +183,7 @@  discard block
 
 block discarded – undo
183 183 
                 return [null => null];
184 184 
             }
185 185 
             if (is_array($availInput[$rel][$col1])) {
186 
-                return call_user_func_array('array_merge', array_map(function ($x, $y) use ($idx) {
186 
+                return call_user_func_array('array_merge', array_map(function($x, $y) use ($idx) {
187 187 
                     return ["{$idx}{$x}" => $y];
188 188 
                 }, array_keys($availInput[$rel][$col1]), $availInput[$rel][$col1]));
189 189 
             }
 
@@ -192,7 +192,7 @@  discard block
 
 block discarded – undo
192 192 
         }, array_keys($rules)));
193 193
194 194 
         $newInput = $array_key_clean_undot($newInput);
195 
-        $newRules = array_map(function ($idx) use ($availInput, $rules) {
195 
+        $newRules = array_map(function($idx) use ($availInput, $rules) {
196 196 
             list($rel, $col) = explode('.', $idx);
197 197 
             //Fix ResetInput Function! A Headache Implementation!
198 198 
             $col1 = explode(':', $col)[0];
 
@@ -200,7 +200,7 @@  discard block
 
 block discarded – undo
200 200 
                 return [null => null];
201 201 
             }
202 202 
             if (is_array($availInput[$rel][$col1])) {
203 
-                return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $rules) {
203 
+                return call_user_func_array('array_merge', array_map(function($x) use ($idx, $rules) {
204 204 
                     return ["{$idx}{$x}" => $rules[$idx]];
205 205 
                 }, array_keys($availInput[$rel][$col1])));
206 206 
             }
 
@@ -209,7 +209,7 @@  discard block
 
 block discarded – undo
209 209 
         $newRules = array_filter(call_user_func_array('array_merge', $newRules), 'strlen', ARRAY_FILTER_USE_KEY);
210 210 
         $newRules = $array_key_clean($newRules);
211 211
212 
-        $newAttributes = array_map(function ($idx) use ($availInput, $attributes) {
212 
+        $newAttributes = array_map(function($idx) use ($availInput, $attributes) {
213 213 
             list($rel, $col) = explode('.', $idx);
214 214 
             //Fix ResetInput Function! A Headache Implementation!
215 215 
             $col1 = explode(':', $col)[0];
 
@@ -218,7 +218,7 @@  discard block
 
 block discarded – undo
218 218 
             }
219 219 
             if (is_array($availInput[$rel][$col1])) {
220 220 
                 if (array_keys($availInput[$rel][$col1])) {
221 
-                    return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $attributes) {
221 
+                    return call_user_func_array('array_merge', array_map(function($x) use ($idx, $attributes) {
222 222 
                         return ["{$idx}.{$x}" => $attributes[$idx]];
223 223 
                     }, array_keys($availInput[$rel][$col1])));
224 224 
                 }
 
@@ -255,7 +255,7 @@  discard block
 
 block discarded – undo
255 255
256 256 
         if (is_array($column)) {
257 257 
             foreach ($column as $index => $col) {
258 
-                $new[$col . $index] = $col;
258 
+                $new[$col.$index] = $col;
259 259 
             }
260 260 
         }
261 261 
 
@@ -267,7 +267,7 @@  discard block
 
 block discarded – undo
267 267 
             } else {
268 268 
                 foreach ($new as $k => $val) {
269 269 
                     if (Str::endsWith($key, ".$k")) {
270 
-                        $attributes[$key] = $label . "[$val]";
270 
+                        $attributes[$key] = $label."[$val]";
271 271 
                     }
272 272 
                 }
273 273 
             }
 
@@ -293,7 +293,7 @@  discard block
 
 block discarded – undo
293 293 
                 continue;
294 294 
             }
295 295
296 
-            $newKey = $key . $column[$key];
296 
+            $newKey = $key.$column[$key];
297 297
298 298 
             /*
299 299 
              * set new key
 
@@ -329,7 +329,7 @@  discard block
 
 block discarded – undo
329 329 
             return json_decode($this->value, true);
330 330 
         }
331 331
332 
-        return (array)$this->value;
332 
+        return (array) $this->value;
333 333 
     }
334 334
335 335 
     /**
Please login to merge, or discard this patch.
src/Form/Field/HasMany.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch 
@@ -101,24 +101,24 @@  discard block
 
 block discarded – undo
101 101 
             return false;
102 102 
         }
103 103
104 
-        $array_key_attach_str = function (array $a, string $b, string $c = '.') {
104 
+        $array_key_attach_str = function(array $a, string $b, string $c = '.') {
105 105 
             return call_user_func_array(
106 106 
                 'array_merge',
107 
-                array_map(function ($u, $v) use ($b, $c) {
107 
+                array_map(function($u, $v) use ($b, $c) {
108 108 
                     return ["{$b}{$c}{$u}" => $v];
109 109 
                 }, array_keys($a), array_values($a))
110 110 
             );
111 111 
         };
112 112
113 
-        $array_key_clean = function (array $a) {
114 
-            $a = count($a) ? call_user_func_array('array_merge', array_map(function ($k, $v) {
113 
+        $array_key_clean = function(array $a) {
114 
+            $a = count($a) ? call_user_func_array('array_merge', array_map(function($k, $v) {
115 115 
                 return [str_replace(':', '', $k) => $v];
116 116 
             }, array_keys($a), array_values($a))) : $a;
117 117
118 118 
             return $a;
119 119 
         };
120 120
121 
-        $array_key_clean_undot = function (array $a) {
121 
+        $array_key_clean_undot = function(array $a) {
122 122 
             if (count($a)) {
123 123 
                 foreach ($a as $key => $val) {
124 124 
                     array_set($a, str_replace(':', '', $key), $val);
 
@@ -137,7 +137,7 @@  discard block
 
 block discarded – undo
137 137 
         $rules = $attributes = [];
138 138 
         $messages = [];
139 139 
         // remove all inputs & keys marked as removed
140 
-        $availInput = array_filter(array_map(function ($v) {
140 
+        $availInput = array_filter(array_map(function($v) {
141 141 
             return $v[NestedForm::REMOVE_FLAG_NAME] ? null : $v;
142 142 
         }, $input[$rel]));
143 143 
         $keys = array_keys($availInput);
 
@@ -151,15 +151,15 @@  discard block
 
 block discarded – undo
151 151 
             if ($field instanceof Field\MultipleSelect) {
152 152 
                 foreach ($keys as $key) {
153 153 
                     $availInput[$key][$column] = array_filter($availInput[$key][$column], 'strlen');
154 
-                    $availInput[$key][$column] = $availInput[$key][$column] ? : null;
154 
+                    $availInput[$key][$column] = $availInput[$key][$column] ?: null;
155 155 
                 }
156 156 
             }
157 157 
             // if($field instanceof Field\File)
158 158 
             // {
159 159 
             //     dd(request());
160 160 
             // }
161 
-            $newColumn = call_user_func_array('array_merge', array_map(function ($u) use ($columns, $rel) {
162 
-                return array_map(function ($k, $v) use ($u, $rel) {
161 
+            $newColumn = call_user_func_array('array_merge', array_map(function($u) use ($columns, $rel) {
162 
+                return array_map(function($k, $v) use ($u, $rel) {
163 163 
                             //Fix ResetInput Function! A Headache Implementation!
164 164 
                     return !$k ? "{$rel}.{$u}.{$v}" : "{$rel}.{$u}.{$v}:{$k}";
165 165 
                 }, array_keys($columns), array_values($columns));
 
@@ -168,22 +168,22 @@  discard block
 
 block discarded – undo
168 168 
             $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules;
169 169 
             $rules = array_merge($rules, call_user_func_array(
170 170 
                 'array_merge',
171 
-                array_map(function ($v) use ($fieldRules) {
171 
+                array_map(function($v) use ($fieldRules) {
172 172 
                     return [$v => $fieldRules];
173 173 
                 }, $newColumn)
174 174 
             ));
175 175 
             $attributes = array_merge($attributes, call_user_func_array(
176 176 
                 'array_merge',
177 
-                array_map(function ($v) use ($field) {
177 
+                array_map(function($v) use ($field) {
178 178 
                     //Fix ResetInput Function! A Headache Implementation!
179 179 
                     $u = $field->label();
180 
-                    $u .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[1])[0] . ']' : '';
180 
+                    $u .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[1])[0].']' : '';
181 181
182 182 
                     return [$v => "{$u}"];
183 183 
                 }, $newColumn)
184 184 
             ));
185 185 
             if ($field->validationMessages) {
186 
-                $newMessages = array_map(function ($v) use ($field, $availInput, $array_key_attach_str) {
186 
+                $newMessages = array_map(function($v) use ($field, $availInput, $array_key_attach_str) {
187 187 
                     list($r, $k, $c) = explode('.', $v);
188 188 
                     //Fix ResetInput Function! A Headache Implementation!
189 189 
                     $col1 = explode(':', $c)[0];
 
@@ -210,7 +210,7 @@  discard block
 
 block discarded – undo
210 210 
             return false;
211 211 
         }
212 212
213 
-        $newInput = call_user_func_array('array_merge', array_map(function ($u) use ($availInput) {
213 
+        $newInput = call_user_func_array('array_merge', array_map(function($u) use ($availInput) {
214 214 
             list($rel, $key, $col) = explode('.', $u);
215 215 
             $idx = "{$rel}.{$key}.{$col}";
216 216 
             //Fix ResetInput Function! A Headache Implementation!
 
@@ -219,7 +219,7 @@  discard block
 
 block discarded – undo
219 219 
                 return [null => null];
220 220 
             }
221 221 
             if (is_array($availInput[$key][$col1])) {
222 
-                return call_user_func_array('array_merge', array_map(function ($x, $y) use ($idx) {
222 
+                return call_user_func_array('array_merge', array_map(function($x, $y) use ($idx) {
223 223 
                     return ["{$idx}{$x}" => $y];
224 224 
                 }, array_keys($availInput[$key][$col1]), $availInput[$key][$col1]));
225 225 
             }
 
@@ -227,7 +227,7 @@  discard block
 
 block discarded – undo
227 227 
         }, array_keys($rules)));
228 228 
         $newInput = $array_key_clean_undot($newInput);
229 229
230 
-        $newRules = array_map(function ($u) use ($availInput, $rules) {
230 
+        $newRules = array_map(function($u) use ($availInput, $rules) {
231 231 
             list($rel, $key, $col) = explode('.', $u);
232 232 
             $idx = "{$rel}.{$key}.{$col}";
233 233 
             //Fix ResetInput Function! A Headache Implementation!
 
@@ -236,7 +236,7 @@  discard block
 
 block discarded – undo
236 236 
                 return [null => null];
237 237 
             }
238 238 
             if (is_array($availInput[$key][$col1])) {
239 
-                return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $rules) {
239 
+                return call_user_func_array('array_merge', array_map(function($x) use ($idx, $rules) {
240 240 
                     return ["{$idx}{$x}" => $rules[$idx]];
241 241 
                 }, array_keys($availInput[$key][$col1])));
242 242 
             }
 
@@ -246,7 +246,7 @@  discard block
 
 block discarded – undo
246 246 
         $newRules = array_filter(call_user_func_array('array_merge', $newRules), 'strlen', ARRAY_FILTER_USE_KEY);
247 247 
         $newRules = $array_key_clean($newRules);
248 248
249 
-        $newAttributes = array_map(function ($u) use ($availInput, $attributes) {
249 
+        $newAttributes = array_map(function($u) use ($availInput, $attributes) {
250 250 
             list($rel, $key, $col) = explode('.', $u);
251 251 
             $idx = "{$rel}.{$key}.{$col}";
252 252 
             //Fix ResetInput Function! A Headache Implementation!
 
@@ -256,7 +256,7 @@  discard block
 
 block discarded – undo
256 256 
             }
257 257 
             if (is_array($availInput[$key][$col1])) {
258 258 
                 if (array_keys($availInput[$key][$col1])) {
259 
-                    return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $attributes) {
259 
+                    return call_user_func_array('array_merge', array_map(function($x) use ($idx, $attributes) {
260 260 
                         return ["{$idx}.{$x}" => $attributes[$idx]];
261 261 
                     }, array_keys($availInput[$key][$col1])));
262 262 
                 }
 
@@ -291,7 +291,7 @@  discard block
 
 block discarded – undo
291 291
292 292 
         if (is_array($column)) {
293 293 
             foreach ($column as $index => $col) {
294 
-                $new[$col . $index] = $col;
294 
+                $new[$col.$index] = $col;
295 295 
             }
296 296 
         }
297 297 
 
@@ -303,7 +303,7 @@  discard block
 
 block discarded – undo
303 303 
             } else {
304 304 
                 foreach ($new as $k => $val) {
305 305 
                     if (Str::endsWith($key, ".$k")) {
306 
-                        $attributes[$key] = $label . "[$val]";
306 
+                        $attributes[$key] = $label."[$val]";
307 307 
                     }
308 308 
                 }
309 309 
             }
 
@@ -361,7 +361,7 @@  discard block
 
 block discarded – undo
361 361 
                  *
362 362 
                  * I don't know why a form need range input? Only can imagine is for range search....
363 363 
                  */
364 
-                $newKey = $name . $column[$name];
364 
+                $newKey = $name.$column[$name];
365 365
366 366 
                 /*
367 367 
                  * set new key
 
@@ -513,7 +513,7 @@  discard block
 
 block discarded – undo
513 513 
      */
514 514 
     protected function setupScript($script)
515 515 
     {
516 
-        $method = 'setupScriptFor' . ucfirst($this->viewMode) . 'View';
516 
+        $method = 'setupScriptFor'.ucfirst($this->viewMode).'View';
517 517
518 518 
         call_user_func([$this, $method], $script);
519 519 
     }
Please login to merge, or discard this patch.