@@ -112,7 +112,7 @@ |
||
112 | 112 | protected function startColumn() |
113 | 113 | { |
114 | 114 | // get classname using width array |
115 | - $classname = implode(' ', collect($this->width)->map(function ($value, $key) { |
|
115 | + $classname = implode(' ', collect($this->width)->map(function($value, $key) { |
|
116 | 116 | return "col-$key-$value"; |
117 | 117 | })->toArray()); |
118 | 118 | echo "<div class=\"{$classname}\">"; |
@@ -79,7 +79,7 @@ |
||
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, |
@@ -259,7 +259,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
@@ -184,7 +184,7 @@ |
||
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 |
@@ -62,24 +62,24 @@ discard block |
||
62 | 62 | $rules = $attributes = $messages = $newInputs = []; |
63 | 63 | $rel = $this->column; |
64 | 64 | $availInput = $input; |
65 | - $array_key_attach_str = function (array $a, string $b, string $c = '.') { |
|
65 | + $array_key_attach_str = function(array $a, string $b, string $c = '.') { |
|
66 | 66 | return call_user_func_array( |
67 | 67 | "array_merge", |
68 | - array_map(function ($u, $v) use ($b, $c) { |
|
68 | + array_map(function($u, $v) use ($b, $c) { |
|
69 | 69 | return ["{$b}{$c}{$u}" => $v]; |
70 | 70 | }, array_keys($a), array_values($a)) |
71 | 71 | ); |
72 | 72 | }; |
73 | 73 | |
74 | - $array_key_clean = function (array $a) { |
|
75 | - $a = count($a) ? call_user_func_array("array_merge", array_map(function ($k, $v) { |
|
74 | + $array_key_clean = function(array $a) { |
|
75 | + $a = count($a) ? call_user_func_array("array_merge", array_map(function($k, $v) { |
|
76 | 76 | return [str_replace(':', '', $k) => $v]; |
77 | 77 | }, array_keys($a), array_values($a))) : $a; |
78 | 78 | |
79 | 79 | return $a; |
80 | 80 | }; |
81 | 81 | |
82 | - $array_clean_merge = function (array $a, $b) { |
|
82 | + $array_clean_merge = function(array $a, $b) { |
|
83 | 83 | return array_merge( |
84 | 84 | $a, |
85 | 85 | call_user_func_array( |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | ); |
94 | 94 | }; |
95 | 95 | |
96 | - $array_key_clean_undot = function (array $a) { |
|
96 | + $array_key_clean_undot = function(array $a) { |
|
97 | 97 | $keys = preg_grep('/[\.\:]/', array_keys($a)); |
98 | 98 | if ($keys) { |
99 | 99 | foreach ($keys as $key) { |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | $columns = is_array($column) ? $column : [$column]; |
116 | 116 | if ($field instanceof Field\MultipleSelect) { |
117 | 117 | $availInput[$column] = array_filter($availInput[$column], 'strlen'); |
118 | - $availInput[$column] = $availInput[$column] ? : null; |
|
118 | + $availInput[$column] = $availInput[$column] ?: null; |
|
119 | 119 | } |
120 | 120 | /* |
121 | 121 | * |
@@ -137,13 +137,13 @@ discard block |
||
137 | 137 | * 'extra.end_atend' => 'required' |
138 | 138 | * ] |
139 | 139 | */ |
140 | - $newColumn = array_map(function ($k, $v) use ($rel) { |
|
140 | + $newColumn = array_map(function($k, $v) use ($rel) { |
|
141 | 141 | //Fix ResetInput Function! A Headache Implementation! |
142 | 142 | return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}"; |
143 | 143 | }, array_keys($columns), array_values($columns)); |
144 | 144 | |
145 | 145 | $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules; |
146 | - $newRules = array_map(function ($v) use ($fieldRules, $availInput) { |
|
146 | + $newRules = array_map(function($v) use ($fieldRules, $availInput) { |
|
147 | 147 | list($k, $c) = explode('.', $v); |
148 | 148 | //Fix ResetInput Function! A Headache Implementation! |
149 | 149 | $col = explode(':', $c)[0]; |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | }, $newColumn); |
160 | 160 | $rules = $array_clean_merge($rules, $newRules); |
161 | 161 | |
162 | - $newInput = array_map(function ($v) use ($availInput, $array_key_attach_str) { |
|
162 | + $newInput = array_map(function($v) use ($availInput, $array_key_attach_str) { |
|
163 | 163 | list($k, $c) = explode('.', $v); |
164 | 164 | //Fix ResetInput Function! A Headache Implementation! |
165 | 165 | $col = explode(':', $c)[0]; |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | }, $newColumn); |
176 | 176 | $newInputs = $array_clean_merge($newInputs, $newInput); |
177 | 177 | |
178 | - $newAttributes = array_map(function ($v) use ($field, $availInput) { |
|
178 | + $newAttributes = array_map(function($v) use ($field, $availInput) { |
|
179 | 179 | list($k, $c) = explode('.', $v); |
180 | 180 | //Fix ResetInput Function! A Headache Implementation! |
181 | 181 | $col = explode(':', $c)[0]; |
@@ -184,24 +184,24 @@ discard block |
||
184 | 184 | } |
185 | 185 | |
186 | 186 | if (is_array($availInput[$k][$col])) { |
187 | - return call_user_func_array("array_merge", array_map(function ($u) use ($v, $field) { |
|
187 | + return call_user_func_array("array_merge", array_map(function($u) use ($v, $field) { |
|
188 | 188 | $w = $field->label(); |
189 | 189 | //Fix ResetInput Function! A Headache Implementation! |
190 | - $w .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[2])[0] . ']' : ''; |
|
190 | + $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : ''; |
|
191 | 191 | return ["{$v}:{$u}" => $w]; |
192 | 192 | }, array_keys($availInput[$k][$col]))); |
193 | 193 | } |
194 | 194 | |
195 | 195 | $w = $field->label(); |
196 | 196 | //Fix ResetInput Function! A Headache Implementation! |
197 | - $w .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[2])[0] . ']' : ''; |
|
197 | + $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : ''; |
|
198 | 198 | |
199 | 199 | return [$v => $w]; |
200 | 200 | }, $newColumn); |
201 | 201 | $attributes = $array_clean_merge($attributes, $newAttributes); |
202 | 202 | |
203 | 203 | if ($field->validationMessages) { |
204 | - $newMessages = array_map(function ($v) use ($field, $availInput, $array_key_attach_str) { |
|
204 | + $newMessages = array_map(function($v) use ($field, $availInput, $array_key_attach_str) { |
|
205 | 205 | list($k, $c) = explode('.', $v); |
206 | 206 | //Fix ResetInput Function! A Headache Implementation! |
207 | 207 | $col = explode(':', $c)[0]; |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | return [null => null]; |
210 | 210 | } |
211 | 211 | if (is_array($availInput[$k][$col])) { |
212 | - return call_user_func_array("array_merge", array_map(function ($u) |
|
212 | + return call_user_func_array("array_merge", array_map(function($u) |
|
213 | 213 | use ($v, $field, $array_key_attach_str) { |
214 | 214 | return $array_key_attach_str($field->validationMessages, "{$v}:{$u}"); |
215 | 215 | }, array_keys($availInput[$k][$col]))); |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | |
257 | 257 | if (is_array($column)) { |
258 | 258 | foreach ($column as $index => $col) { |
259 | - $new[$col . $index] = $col; |
|
259 | + $new[$col.$index] = $col; |
|
260 | 260 | } |
261 | 261 | } |
262 | 262 | |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | } else { |
269 | 269 | foreach ($new as $k => $val) { |
270 | 270 | if (Str::endsWith($key, ".$k")) { |
271 | - $attributes[$key] = $label . "[$val]"; |
|
271 | + $attributes[$key] = $label."[$val]"; |
|
272 | 272 | } |
273 | 273 | } |
274 | 274 | } |
@@ -294,7 +294,7 @@ discard block |
||
294 | 294 | continue; |
295 | 295 | } |
296 | 296 | |
297 | - $newKey = $key . $column[$key]; |
|
297 | + $newKey = $key.$column[$key]; |
|
298 | 298 | |
299 | 299 | /* |
300 | 300 | * set new key |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | return json_decode($this->value, true); |
331 | 331 | } |
332 | 332 | |
333 | - return (array)$this->value; |
|
333 | + return (array) $this->value; |
|
334 | 334 | } |
335 | 335 | |
336 | 336 | /** |
@@ -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_clean_merge = function (array $a, $b) { |
|
121 | + $array_clean_merge = function(array $a, $b) { |
|
122 | 122 | return array_merge( |
123 | 123 | $a, |
124 | 124 | call_user_func_array( |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | ); |
133 | 133 | }; |
134 | 134 | |
135 | - $array_key_clean_undot = function (array $a) { |
|
135 | + $array_key_clean_undot = function(array $a) { |
|
136 | 136 | $keys = preg_grep('/[\.\:]/', array_keys($a)); |
137 | 137 | if ($keys) { |
138 | 138 | foreach ($keys as $key) { |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | $rel = $this->relationName; |
150 | 150 | $rules = $attributes = $messages = $newInputs = []; |
151 | 151 | // remove all inputs & keys marked as removed |
152 | - $availInput = array_filter(array_map(function ($v) { |
|
152 | + $availInput = array_filter(array_map(function($v) { |
|
153 | 153 | return $v[NestedForm::REMOVE_FLAG_NAME] ? null : $v; |
154 | 154 | }, $input[$rel])); |
155 | 155 | $keys = array_keys($availInput); |
@@ -162,19 +162,19 @@ discard block |
||
162 | 162 | $columns = is_array($column) ? $column : [$column]; |
163 | 163 | if ($field instanceof Field\MultipleSelect) { |
164 | 164 | foreach ($keys as $key) { |
165 | - $availInput[$key][$column] = array_filter($availInput[$key][$column], "strlen") ? : null; |
|
165 | + $availInput[$key][$column] = array_filter($availInput[$key][$column], "strlen") ?: null; |
|
166 | 166 | } |
167 | 167 | } |
168 | 168 | |
169 | - $newColumn = call_user_func_array("array_merge", array_map(function ($u) use ($columns, $rel) { |
|
170 | - return array_map(function ($k, $v) use ($u, $rel) { |
|
169 | + $newColumn = call_user_func_array("array_merge", array_map(function($u) use ($columns, $rel) { |
|
170 | + return array_map(function($k, $v) use ($u, $rel) { |
|
171 | 171 | //Fix ResetInput Function! A Headache Implementation! |
172 | 172 | return $k ? "{$rel}.{$u}.{$v}:{$k}" : "{$rel}.{$u}.{$v}"; |
173 | 173 | }, array_keys($columns), array_values($columns)); |
174 | 174 | }, $keys)); |
175 | 175 | |
176 | 176 | $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules; |
177 | - $newRules = array_map(function ($v) use ($fieldRules, $availInput, $array_key_attach_str) { |
|
177 | + $newRules = array_map(function($v) use ($fieldRules, $availInput, $array_key_attach_str) { |
|
178 | 178 | list($r, $k, $c) = explode('.', $v); |
179 | 179 | //Fix ResetInput Function! A Headache Implementation! |
180 | 180 | $col = explode(':', $c)[0]; |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | }, $newColumn); |
191 | 191 | $rules = $array_clean_merge($rules, $newRules); |
192 | 192 | |
193 | - $newInput = array_map(function ($v) use ($availInput, $array_key_attach_str) { |
|
193 | + $newInput = array_map(function($v) use ($availInput, $array_key_attach_str) { |
|
194 | 194 | list($r, $k, $c) = explode('.', $v); |
195 | 195 | //Fix ResetInput Function! A Headache Implementation! |
196 | 196 | $col = explode(':', $c)[0]; |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | }, $newColumn); |
207 | 207 | $newInputs = $array_clean_merge($newInputs, $newInput); |
208 | 208 | |
209 | - $newAttributes = array_map(function ($v) use ($field, $availInput) { |
|
209 | + $newAttributes = array_map(function($v) use ($field, $availInput) { |
|
210 | 210 | list($r, $k, $c) = explode('.', $v); |
211 | 211 | //Fix ResetInput Function! A Headache Implementation! |
212 | 212 | $col = explode(':', $c)[0]; |
@@ -215,24 +215,24 @@ discard block |
||
215 | 215 | } |
216 | 216 | |
217 | 217 | if (is_array($availInput[$k][$col])) { |
218 | - return call_user_func_array("array_merge", array_map(function ($u) use ($v, $field) { |
|
218 | + return call_user_func_array("array_merge", array_map(function($u) use ($v, $field) { |
|
219 | 219 | $w = $field->label(); |
220 | 220 | //Fix ResetInput Function! A Headache Implementation! |
221 | - $w .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[2])[0] . ']' : ''; |
|
221 | + $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : ''; |
|
222 | 222 | return ["{$v}:{$u}" => $w]; |
223 | 223 | }, array_keys($availInput[$k][$col]))); |
224 | 224 | } |
225 | 225 | |
226 | 226 | $w = $field->label(); |
227 | 227 | //Fix ResetInput Function! A Headache Implementation! |
228 | - $w .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[2])[0] . ']' : ''; |
|
228 | + $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : ''; |
|
229 | 229 | |
230 | 230 | return [$v => $w]; |
231 | 231 | }, $newColumn); |
232 | 232 | $attributes = $array_clean_merge($attributes, $newAttributes); |
233 | 233 | |
234 | 234 | if ($field->validationMessages) { |
235 | - $newMessages = array_map(function ($v) use ($field, $availInput, $array_key_attach_str) { |
|
235 | + $newMessages = array_map(function($v) use ($field, $availInput, $array_key_attach_str) { |
|
236 | 236 | list($r, $k, $c) = explode('.', $v); |
237 | 237 | //Fix ResetInput Function! A Headache Implementation! |
238 | 238 | $col = explode(':', $c)[0]; |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | return [null => null]; |
241 | 241 | } |
242 | 242 | if (is_array($availInput[$k][$col])) { |
243 | - return call_user_func_array("array_merge", array_map(function ($u) |
|
243 | + return call_user_func_array("array_merge", array_map(function($u) |
|
244 | 244 | use ($v, $field, $array_key_attach_str) { |
245 | 245 | return $array_key_attach_str($field->validationMessages, "{$v}:{$u}"); |
246 | 246 | }, array_keys($availInput[$k][$col]))); |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | |
287 | 287 | if (is_array($column)) { |
288 | 288 | foreach ($column as $index => $col) { |
289 | - $new[$col . $index] = $col; |
|
289 | + $new[$col.$index] = $col; |
|
290 | 290 | } |
291 | 291 | } |
292 | 292 | |
@@ -298,7 +298,7 @@ discard block |
||
298 | 298 | } else { |
299 | 299 | foreach ($new as $k => $val) { |
300 | 300 | if (Str::endsWith($key, ".$k")) { |
301 | - $attributes[$key] = $label . "[$val]"; |
|
301 | + $attributes[$key] = $label."[$val]"; |
|
302 | 302 | } |
303 | 303 | } |
304 | 304 | } |
@@ -357,7 +357,7 @@ discard block |
||
357 | 357 | * |
358 | 358 | * I don't know why a form need range input? Only can imagine is for range search.... |
359 | 359 | */ |
360 | - $newKey = $name . $column[$name]; |
|
360 | + $newKey = $name.$column[$name]; |
|
361 | 361 | |
362 | 362 | /* |
363 | 363 | * set new key |
@@ -509,7 +509,7 @@ discard block |
||
509 | 509 | */ |
510 | 510 | protected function setupScript($script) |
511 | 511 | { |
512 | - $method = 'setupScriptFor' . ucfirst($this->viewMode) . 'View'; |
|
512 | + $method = 'setupScriptFor'.ucfirst($this->viewMode).'View'; |
|
513 | 513 | |
514 | 514 | call_user_func([$this, $method], $script); |
515 | 515 | } |