@@ -64,24 +64,24 @@ discard block |
||
64 | 64 | $rel = $this->column; |
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 | $keys = preg_grep('/[\.\:]/', array_keys($a)); |
86 | 86 | if ($keys) { |
87 | 87 | foreach ($keys as $key) { |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | * 'extra.end_atend' => 'required' |
127 | 127 | * ] |
128 | 128 | */ |
129 | - $newColumn = array_map(function ($k, $v) use ($rel) { |
|
129 | + $newColumn = array_map(function($k, $v) use ($rel) { |
|
130 | 130 | //Fix ResetInput Function! A Headache Implementation! |
131 | 131 | return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}"; |
132 | 132 | }, array_keys($columns), array_values($columns)); |
@@ -134,13 +134,13 @@ discard block |
||
134 | 134 | $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules; |
135 | 135 | $rules = array_merge($rules, call_user_func_array( |
136 | 136 | 'array_merge', |
137 | - array_map(function ($v) use ($fieldRules) { |
|
137 | + array_map(function($v) use ($fieldRules) { |
|
138 | 138 | return [$v => $fieldRules]; |
139 | 139 | }, $newColumn) |
140 | 140 | )); |
141 | 141 | $attributes = array_merge($attributes, call_user_func_array( |
142 | 142 | 'array_merge', |
143 | - array_map(function ($v) use ($field) { |
|
143 | + array_map(function($v) use ($field) { |
|
144 | 144 | //Fix ResetInput Function! A Headache Implementation! |
145 | 145 | $u = $field->label(); |
146 | 146 | $u .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[1])[0].']' : ''; |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | }, $newColumn) |
150 | 150 | )); |
151 | 151 | if ($field->validationMessages) { |
152 | - $newMessages = array_map(function ($v) use ($field, $availInput, $array_key_attach_str) { |
|
152 | + $newMessages = array_map(function($v) use ($field, $availInput, $array_key_attach_str) { |
|
153 | 153 | list($rel, $col) = explode('.', $v); |
154 | 154 | //Fix ResetInput Function! A Headache Implementation! |
155 | 155 | $col1 = explode(':', $col)[0]; |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | if (empty($rules)) { |
177 | 177 | return false; |
178 | 178 | } |
179 | - $newInput = call_user_func_array('array_merge', array_map(function ($idx) use ($availInput) { |
|
179 | + $newInput = call_user_func_array('array_merge', array_map(function($idx) use ($availInput) { |
|
180 | 180 | list($rel, $col) = explode('.', $idx); |
181 | 181 | //Fix ResetInput Function! A Headache Implementation! |
182 | 182 | $col1 = explode(':', $col)[0]; |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | return [null => null]; |
185 | 185 | } |
186 | 186 | if (is_array($availInput[$rel][$col1])) { |
187 | - return call_user_func_array('array_merge', array_map(function ($x, $y) use ($idx) { |
|
187 | + return call_user_func_array('array_merge', array_map(function($x, $y) use ($idx) { |
|
188 | 188 | return ["{$idx}{$x}" => $y]; |
189 | 189 | }, array_keys($availInput[$rel][$col1]), $availInput[$rel][$col1])); |
190 | 190 | } |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | }, array_keys($rules))); |
194 | 194 | |
195 | 195 | $newInput = $array_key_clean_undot($newInput); |
196 | - $newRules = array_map(function ($idx) use ($availInput, $rules) { |
|
196 | + $newRules = array_map(function($idx) use ($availInput, $rules) { |
|
197 | 197 | list($rel, $col) = explode('.', $idx); |
198 | 198 | //Fix ResetInput Function! A Headache Implementation! |
199 | 199 | $col1 = explode(':', $col)[0]; |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | return [null => null]; |
202 | 202 | } |
203 | 203 | if (is_array($availInput[$rel][$col1])) { |
204 | - return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $rules) { |
|
204 | + return call_user_func_array('array_merge', array_map(function($x) use ($idx, $rules) { |
|
205 | 205 | return ["{$idx}{$x}" => $rules[$idx]]; |
206 | 206 | }, array_keys($availInput[$rel][$col1]))); |
207 | 207 | } |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | $newRules = array_filter(call_user_func_array('array_merge', $newRules), 'strlen', ARRAY_FILTER_USE_KEY); |
212 | 212 | $newRules = $array_key_clean($newRules); |
213 | 213 | |
214 | - $newAttributes = array_map(function ($idx) use ($availInput, $attributes) { |
|
214 | + $newAttributes = array_map(function($idx) use ($availInput, $attributes) { |
|
215 | 215 | list($rel, $col) = explode('.', $idx); |
216 | 216 | //Fix ResetInput Function! A Headache Implementation! |
217 | 217 | $col1 = explode(':', $col)[0]; |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | } |
221 | 221 | if (is_array($availInput[$rel][$col1])) { |
222 | 222 | if (array_keys($availInput[$rel][$col1])) { |
223 | - return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $attributes) { |
|
223 | + return call_user_func_array('array_merge', array_map(function($x) use ($idx, $attributes) { |
|
224 | 224 | return ["{$idx}.{$x}" => $attributes[$idx]]; |
225 | 225 | }, array_keys($availInput[$rel][$col1]))); |
226 | 226 | } |
@@ -101,24 +101,24 @@ discard block |
||
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 | $keys = preg_grep('/[\.\:]/', array_keys($a)); |
123 | 123 | if ($keys) { |
124 | 124 | foreach ($keys as $key) { |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | $rules = $attributes = []; |
137 | 137 | $messages = []; |
138 | 138 | // remove all inputs & keys marked as removed |
139 | - $availInput = array_filter(array_map(function ($v) { |
|
139 | + $availInput = array_filter(array_map(function($v) { |
|
140 | 140 | return $v[NestedForm::REMOVE_FLAG_NAME] ? null : $v; |
141 | 141 | }, $input[$rel])); |
142 | 142 | $keys = array_keys($availInput); |
@@ -150,22 +150,22 @@ discard block |
||
150 | 150 | if ($field instanceof Field\MultipleSelect) { |
151 | 151 | foreach ($keys as $key) { |
152 | 152 | $availInput[$key][$column] = array_filter($availInput[$key][$column], 'strlen'); |
153 | - $availInput[$key][$column] = $availInput[$key][$column] ? : null; |
|
153 | + $availInput[$key][$column] = $availInput[$key][$column] ?: null; |
|
154 | 154 | } |
155 | 155 | } |
156 | 156 | // if($field instanceof Field\File) |
157 | 157 | // { |
158 | 158 | // dd(request()); |
159 | 159 | // } |
160 | - $newColumn = call_user_func_array('array_merge', array_map(function ($u) use ($columns, $rel) { |
|
161 | - return array_map(function ($k, $v) use ($u, $rel) { |
|
160 | + $newColumn = call_user_func_array('array_merge', array_map(function($u) use ($columns, $rel) { |
|
161 | + return array_map(function($k, $v) use ($u, $rel) { |
|
162 | 162 | //Fix ResetInput Function! A Headache Implementation! |
163 | 163 | return $k ? "{$rel}.{$u}.{$v}:{$k}" : "{$rel}.{$u}.{$v}"; |
164 | 164 | }, array_keys($columns), array_values($columns)); |
165 | 165 | }, $keys)); |
166 | 166 | |
167 | 167 | $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules; |
168 | - $newRules = array_map(function ($v) use ($fieldRules, $availInput) { |
|
168 | + $newRules = array_map(function($v) use ($fieldRules, $availInput) { |
|
169 | 169 | list($r, $k, $c) = explode('.', $v); |
170 | 170 | //Fix ResetInput Function! A Headache Implementation! |
171 | 171 | $col = explode(':', $c)[0]; |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | } |
175 | 175 | |
176 | 176 | if (is_array($availInput[$k][$col])) { |
177 | - return call_user_func_array('array_merge', array_map(function ($u) use ($v, $fieldRules) { |
|
177 | + return call_user_func_array('array_merge', array_map(function($u) use ($v, $fieldRules) { |
|
178 | 178 | return ["{$v}{$u}" => $fieldRules]; |
179 | 179 | }, array_keys($availInput[$k][$col]))); |
180 | 180 | } |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | ) |
194 | 194 | ); |
195 | 195 | |
196 | - $newAttributes = array_map(function ($v) use ($field, $availInput) { |
|
196 | + $newAttributes = array_map(function($v) use ($field, $availInput) { |
|
197 | 197 | list($r, $k, $c) = explode('.', $v); |
198 | 198 | //Fix ResetInput Function! A Headache Implementation! |
199 | 199 | $col = explode(':', $c)[0]; |
@@ -202,17 +202,17 @@ discard block |
||
202 | 202 | } |
203 | 203 | |
204 | 204 | if (is_array($availInput[$k][$col])) { |
205 | - return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field) { |
|
205 | + return call_user_func_array('array_merge', array_map(function($u) use ($v, $field) { |
|
206 | 206 | $w = $field->label(); |
207 | 207 | //Fix ResetInput Function! A Headache Implementation! |
208 | - $w .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[1])[0] . ']' : ''; |
|
208 | + $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[1])[0].']' : ''; |
|
209 | 209 | return ["{$v}{$u}" => $w]; |
210 | 210 | }, array_keys($$availInput[$k][$col]))); |
211 | 211 | } |
212 | 212 | |
213 | 213 | $w = $field->label(); |
214 | 214 | //Fix ResetInput Function! A Headache Implementation! |
215 | - $w .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[1])[0] . ']' : ''; |
|
215 | + $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[1])[0].']' : ''; |
|
216 | 216 | |
217 | 217 | return [$v => $w]; |
218 | 218 | }, $newColumn); |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | ); |
230 | 230 | |
231 | 231 | if ($field->validationMessages) { |
232 | - $newMessages = array_map(function ($v) use ($field, $availInput, $array_key_attach_str) { |
|
232 | + $newMessages = array_map(function($v) use ($field, $availInput, $array_key_attach_str) { |
|
233 | 233 | list($r, $k, $c) = explode('.', $v); |
234 | 234 | //Fix ResetInput Function! A Headache Implementation! |
235 | 235 | $col1 = explode(':', $c)[0]; |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | return false; |
258 | 258 | } |
259 | 259 | |
260 | - $newInput = call_user_func_array('array_merge', array_map(function ($u) use ($availInput) { |
|
260 | + $newInput = call_user_func_array('array_merge', array_map(function($u) use ($availInput) { |
|
261 | 261 | list($rel, $key, $col) = explode('.', $u); |
262 | 262 | $idx = "{$rel}.{$key}.{$col}"; |
263 | 263 | //Fix ResetInput Function! A Headache Implementation! |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | return [null => null]; |
267 | 267 | } |
268 | 268 | if (is_array($availInput[$key][$col1])) { |
269 | - return call_user_func_array('array_merge', array_map(function ($x, $y) use ($idx) { |
|
269 | + return call_user_func_array('array_merge', array_map(function($x, $y) use ($idx) { |
|
270 | 270 | return ["{$idx}{$x}" => $y]; |
271 | 271 | }, array_keys($availInput[$key][$col1]), $availInput[$key][$col1])); |
272 | 272 | } |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | |
301 | 301 | if (is_array($column)) { |
302 | 302 | foreach ($column as $index => $col) { |
303 | - $new[$col . $index] = $col; |
|
303 | + $new[$col.$index] = $col; |
|
304 | 304 | } |
305 | 305 | } |
306 | 306 | |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | } else { |
313 | 313 | foreach ($new as $k => $val) { |
314 | 314 | if (Str::endsWith($key, ".$k")) { |
315 | - $attributes[$key] = $label . "[$val]"; |
|
315 | + $attributes[$key] = $label."[$val]"; |
|
316 | 316 | } |
317 | 317 | } |
318 | 318 | } |
@@ -370,7 +370,7 @@ discard block |
||
370 | 370 | * |
371 | 371 | * I don't know why a form need range input? Only can imagine is for range search.... |
372 | 372 | */ |
373 | - $newKey = $name . $column[$name]; |
|
373 | + $newKey = $name.$column[$name]; |
|
374 | 374 | |
375 | 375 | /* |
376 | 376 | * set new key |
@@ -522,7 +522,7 @@ discard block |
||
522 | 522 | */ |
523 | 523 | protected function setupScript($script) |
524 | 524 | { |
525 | - $method = 'setupScriptFor' . ucfirst($this->viewMode) . 'View'; |
|
525 | + $method = 'setupScriptFor'.ucfirst($this->viewMode).'View'; |
|
526 | 526 | |
527 | 527 | call_user_func([$this, $method], $script); |
528 | 528 | } |