@@ -61,28 +61,28 @@ discard block |
||
61 | 61 | $rules = $attributes = $messages = $newInputs = []; |
62 | 62 | $rel = $this->column; |
63 | 63 | $availInput = $input; |
64 | - $array_key_attach_str = function (array $a, string $b, string $c = '.') { |
|
64 | + $array_key_attach_str = function(array $a, string $b, string $c = '.') { |
|
65 | 65 | return call_user_func_array( |
66 | 66 | 'array_merge', |
67 | - array_map(function ($u, $v) use ($b, $c) { |
|
67 | + array_map(function($u, $v) use ($b, $c) { |
|
68 | 68 | return ["{$b}{$c}{$u}" => $v]; |
69 | 69 | }, array_keys($a), array_values($a)) |
70 | 70 | ); |
71 | 71 | }; |
72 | 72 | |
73 | - $array_key_clean = function (array $a) { |
|
74 | - $a = count($a) ? call_user_func_array('array_merge', array_map(function ($k, $v) { |
|
73 | + $array_key_clean = function(array $a) { |
|
74 | + $a = count($a) ? call_user_func_array('array_merge', array_map(function($k, $v) { |
|
75 | 75 | return [str_replace(':', '', $k) => $v]; |
76 | 76 | }, array_keys($a), array_values($a))) : $a; |
77 | 77 | |
78 | 78 | return $a; |
79 | 79 | }; |
80 | 80 | |
81 | - $array_clean_merge = function (array $a, $b) { |
|
81 | + $array_clean_merge = function(array $a, $b) { |
|
82 | 82 | return array_merge($a, call_user_func_array('array_merge', $b)); |
83 | 83 | }; |
84 | 84 | |
85 | - $array_key_clean_undot = function (array $a) { |
|
85 | + $array_key_clean_undot = function(array $a) { |
|
86 | 86 | $keys = preg_grep('/[\.\:]/', array_keys($a)); |
87 | 87 | if ($keys) { |
88 | 88 | foreach ($keys as $key) { |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | $columns = is_array($column) ? $column : [$column]; |
105 | 105 | if ($field instanceof Field\MultipleSelect) { |
106 | 106 | $availInput[$column] = array_filter($availInput[$column], 'strlen'); |
107 | - $availInput[$column] = $availInput[$column] ? : null; |
|
107 | + $availInput[$column] = $availInput[$column] ?: null; |
|
108 | 108 | } |
109 | 109 | /* |
110 | 110 | * |
@@ -126,13 +126,13 @@ 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)); |
133 | 133 | |
134 | 134 | $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules; |
135 | - $newRules = array_map(function ($v) use ($fieldRules, $availInput) { |
|
135 | + $newRules = array_map(function($v) use ($fieldRules, $availInput) { |
|
136 | 136 | list($k, $c) = explode('.', $v); |
137 | 137 | //Fix ResetInput Function! A Headache Implementation! |
138 | 138 | $col = explode(':', $c)[0]; |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | }, $newColumn); |
147 | 147 | $rules = $array_clean_merge($rules, $newRules); |
148 | 148 | |
149 | - $newInput = array_map(function ($v) use ($availInput, $array_key_attach_str) { |
|
149 | + $newInput = array_map(function($v) use ($availInput, $array_key_attach_str) { |
|
150 | 150 | list($k, $c) = explode('.', $v); |
151 | 151 | //Fix ResetInput Function! A Headache Implementation! |
152 | 152 | $col = explode(':', $c)[0]; |
@@ -163,15 +163,15 @@ discard block |
||
163 | 163 | }, $newColumn); |
164 | 164 | $newInputs = $array_clean_merge($newInputs, $newInput); |
165 | 165 | |
166 | - $newAttributes = array_map(function ($v) use ($field, $availInput) { |
|
166 | + $newAttributes = array_map(function($v) use ($field, $availInput) { |
|
167 | 167 | list($k, $c) = explode('.', $v); |
168 | 168 | //Fix ResetInput Function! A Headache Implementation! |
169 | 169 | $col = explode(':', $c)[0]; |
170 | 170 | if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) { |
171 | - return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field) { |
|
171 | + return call_user_func_array('array_merge', array_map(function($u) use ($v, $field) { |
|
172 | 172 | $w = $field->label(); |
173 | 173 | //Fix ResetInput Function! A Headache Implementation! |
174 | - $w .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[2])[0] . ']' : ''; |
|
174 | + $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : ''; |
|
175 | 175 | |
176 | 176 | return ["{$v}:{$u}" => $w]; |
177 | 177 | }, array_keys($availInput[$k][$col]))); |
@@ -180,19 +180,19 @@ discard block |
||
180 | 180 | //May Have Problem in Dealing with File Upload in Edit Mode |
181 | 181 | $w = $field->label(); |
182 | 182 | //Fix ResetInput Function! A Headache Implementation! |
183 | - $w .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[2])[0] . ']' : ''; |
|
183 | + $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : ''; |
|
184 | 184 | |
185 | 185 | return [$v => $w]; |
186 | 186 | }, $newColumn); |
187 | 187 | $attributes = $array_clean_merge($attributes, $newAttributes); |
188 | 188 | |
189 | 189 | if ($field->validationMessages) { |
190 | - $newMessages = array_map(function ($v) use ($field, $availInput, $array_key_attach_str) { |
|
190 | + $newMessages = array_map(function($v) use ($field, $availInput, $array_key_attach_str) { |
|
191 | 191 | list($k, $c) = explode('.', $v); |
192 | 192 | //Fix ResetInput Function! A Headache Implementation! |
193 | 193 | $col = explode(':', $c)[0]; |
194 | 194 | if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) { |
195 | - return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field, $array_key_attach_str) { |
|
195 | + return call_user_func_array('array_merge', array_map(function($u) use ($v, $field, $array_key_attach_str) { |
|
196 | 196 | return $array_key_attach_str($field->validationMessages, "{$v}:{$u}"); |
197 | 197 | }, array_keys($availInput[$k][$col]))); |
198 | 198 | } |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | return json_decode($this->value, true); |
248 | 248 | } |
249 | 249 | |
250 | - return (array)$this->value; |
|
250 | + return (array) $this->value; |
|
251 | 251 | } |
252 | 252 | |
253 | 253 | /** |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | */ |
54 | 54 | public function fill($data, $prefix = '') |
55 | 55 | { |
56 | - $this->value = array_get($data, $prefix . $this->column); |
|
56 | + $this->value = array_get($data, $prefix.$this->column); |
|
57 | 57 | |
58 | 58 | if (is_array($this->value) && $this->keyAsValue) { |
59 | 59 | $this->value = array_column($this->value, $this->visibleColumn, $this->key); |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | $this->value = explode(',', $this->value); |
64 | 64 | } |
65 | 65 | |
66 | - $this->value = array_filter((array)$this->value, 'strlen'); |
|
66 | + $this->value = array_filter((array) $this->value, 'strlen'); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | /** |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | return empty($this->value) ? ($this->getDefault() ?? []) : $this->value; |
158 | 158 | } |
159 | 159 | |
160 | - $this->value = (array)$value; |
|
160 | + $this->value = (array) $value; |
|
161 | 161 | |
162 | 162 | return $this; |
163 | 163 | } |
@@ -100,28 +100,28 @@ discard block |
||
100 | 100 | return false; |
101 | 101 | } |
102 | 102 | |
103 | - $array_key_attach_str = function (array $a, string $b, string $c = '.') { |
|
103 | + $array_key_attach_str = function(array $a, string $b, string $c = '.') { |
|
104 | 104 | return call_user_func_array( |
105 | 105 | 'array_merge', |
106 | - array_map(function ($u, $v) use ($b, $c) { |
|
106 | + array_map(function($u, $v) use ($b, $c) { |
|
107 | 107 | return ["{$b}{$c}{$u}" => $v]; |
108 | 108 | }, array_keys($a), array_values($a)) |
109 | 109 | ); |
110 | 110 | }; |
111 | 111 | |
112 | - $array_key_clean = function (array $a) { |
|
113 | - $a = count($a) ? call_user_func_array('array_merge', array_map(function ($k, $v) { |
|
112 | + $array_key_clean = function(array $a) { |
|
113 | + $a = count($a) ? call_user_func_array('array_merge', array_map(function($k, $v) { |
|
114 | 114 | return [str_replace(':', '', $k) => $v]; |
115 | 115 | }, array_keys($a), array_values($a))) : $a; |
116 | 116 | |
117 | 117 | return $a; |
118 | 118 | }; |
119 | 119 | |
120 | - $array_clean_merge = function (array $a, $b) { |
|
120 | + $array_clean_merge = function(array $a, $b) { |
|
121 | 121 | return array_merge($a, call_user_func_array('array_merge', $b)); |
122 | 122 | }; |
123 | 123 | |
124 | - $array_key_clean_undot = function (array $a) { |
|
124 | + $array_key_clean_undot = function(array $a) { |
|
125 | 125 | $keys = preg_grep('/[\.\:]/', array_keys($a)); |
126 | 126 | if ($keys) { |
127 | 127 | foreach ($keys as $key) { |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | $rel = $this->relationName; |
139 | 139 | $rules = $attributes = $messages = $newInputs = []; |
140 | 140 | // remove all inputs & keys marked as removed |
141 | - $availInput = array_filter(array_map(function ($v) { |
|
141 | + $availInput = array_filter(array_map(function($v) { |
|
142 | 142 | return $v[NestedForm::REMOVE_FLAG_NAME] ? null : $v; |
143 | 143 | }, $input[$rel])); |
144 | 144 | $keys = array_keys($availInput); |
@@ -151,19 +151,19 @@ discard block |
||
151 | 151 | $columns = is_array($column) ? $column : [$column]; |
152 | 152 | if ($field instanceof Field\MultipleSelect) { |
153 | 153 | foreach ($keys as $key) { |
154 | - $availInput[$key][$column] = array_filter($availInput[$key][$column], 'strlen') ? : null; |
|
154 | + $availInput[$key][$column] = array_filter($availInput[$key][$column], 'strlen') ?: null; |
|
155 | 155 | } |
156 | 156 | } |
157 | 157 | |
158 | - $newColumn = call_user_func_array('array_merge', array_map(function ($u) use ($columns, $rel) { |
|
159 | - return array_map(function ($k, $v) use ($u, $rel) { |
|
158 | + $newColumn = call_user_func_array('array_merge', array_map(function($u) use ($columns, $rel) { |
|
159 | + return array_map(function($k, $v) use ($u, $rel) { |
|
160 | 160 | //Fix ResetInput Function! A Headache Implementation! |
161 | 161 | return $k ? "{$rel}.{$u}.{$v}:{$k}" : "{$rel}.{$u}.{$v}"; |
162 | 162 | }, array_keys($columns), array_values($columns)); |
163 | 163 | }, $keys)); |
164 | 164 | |
165 | 165 | $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules; |
166 | - $newRules = array_map(function ($v) use ($fieldRules, $availInput, $array_key_attach_str) { |
|
166 | + $newRules = array_map(function($v) use ($fieldRules, $availInput, $array_key_attach_str) { |
|
167 | 167 | list($r, $k, $c) = explode('.', $v); |
168 | 168 | //Fix ResetInput Function! A Headache Implementation! |
169 | 169 | $col = explode(':', $c)[0]; |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | }, $newColumn); |
177 | 177 | $rules = $array_clean_merge($rules, $newRules); |
178 | 178 | |
179 | - $newInput = array_map(function ($v) use ($availInput, $array_key_attach_str) { |
|
179 | + $newInput = array_map(function($v) use ($availInput, $array_key_attach_str) { |
|
180 | 180 | list($r, $k, $c) = explode('.', $v); |
181 | 181 | //Fix ResetInput Function! A Headache Implementation! |
182 | 182 | $col = explode(':', $c)[0]; |
@@ -193,15 +193,15 @@ discard block |
||
193 | 193 | }, $newColumn); |
194 | 194 | $newInputs = $array_clean_merge($newInputs, $newInput); |
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]; |
200 | 200 | if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) { |
201 | - return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field) { |
|
201 | + return call_user_func_array('array_merge', array_map(function($u) use ($v, $field) { |
|
202 | 202 | $w = $field->label(); |
203 | 203 | //Fix ResetInput Function! A Headache Implementation! |
204 | - $w .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[2])[0] . ']' : ''; |
|
204 | + $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : ''; |
|
205 | 205 | |
206 | 206 | return ["{$v}:{$u}" => $w]; |
207 | 207 | }, array_keys($availInput[$k][$col]))); |
@@ -210,19 +210,19 @@ discard block |
||
210 | 210 | //May Have Problem in Dealing with File Upload in Edit Mode |
211 | 211 | $w = $field->label(); |
212 | 212 | //Fix ResetInput Function! A Headache Implementation! |
213 | - $w .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[2])[0] . ']' : ''; |
|
213 | + $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : ''; |
|
214 | 214 | |
215 | 215 | return [$v => $w]; |
216 | 216 | }, $newColumn); |
217 | 217 | $attributes = $array_clean_merge($attributes, $newAttributes); |
218 | 218 | |
219 | 219 | if ($field->validationMessages) { |
220 | - $newMessages = array_map(function ($v) use ($field, $availInput, $array_key_attach_str) { |
|
220 | + $newMessages = array_map(function($v) use ($field, $availInput, $array_key_attach_str) { |
|
221 | 221 | list($r, $k, $c) = explode('.', $v); |
222 | 222 | //Fix ResetInput Function! A Headache Implementation! |
223 | 223 | $col = explode(':', $c)[0]; |
224 | 224 | if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) { |
225 | - return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field, $array_key_attach_str) { |
|
225 | + return call_user_func_array('array_merge', array_map(function($u) use ($v, $field, $array_key_attach_str) { |
|
226 | 226 | return $array_key_attach_str($field->validationMessages, "{$v}:{$u}"); |
227 | 227 | }, array_keys($availInput[$k][$col]))); |
228 | 228 | } |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | */ |
392 | 392 | protected function setupScript($script) |
393 | 393 | { |
394 | - $method = 'setupScriptFor' . ucfirst($this->viewMode) . 'View'; |
|
394 | + $method = 'setupScriptFor'.ucfirst($this->viewMode).'View'; |
|
395 | 395 | |
396 | 396 | call_user_func([$this, $method], $script); |
397 | 397 | } |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | |
40 | 40 | public function fill($data, $prefix = '') |
41 | 41 | { |
42 | - $relations = array_get($data, $prefix . $this->column); |
|
42 | + $relations = array_get($data, $prefix.$this->column); |
|
43 | 43 | |
44 | 44 | if (is_string($relations)) { |
45 | 45 | $this->value = explode(',', $relations); |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | |
82 | 82 | public function prepare($value) |
83 | 83 | { |
84 | - $value = (array)$value; |
|
84 | + $value = (array) $value; |
|
85 | 85 | |
86 | 86 | return array_filter($value, 'strlen'); |
87 | 87 | } |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | if (array_key_exists($key, $this->original)) { |
184 | 184 | $values = $this->original[$key]; |
185 | 185 | } |
186 | - $this->fields->each(function (Field $field) use ($values) { |
|
186 | + $this->fields->each(function(Field $field) use ($values) { |
|
187 | 187 | $field->setOriginal($values); |
188 | 188 | }); |
189 | 189 | } |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | |
340 | 340 | $elementName = $elementClass = $errorKey = []; |
341 | 341 | |
342 | - $key = $this->key ? : 'new_' . static::DEFAULT_KEY_NAME; |
|
342 | + $key = $this->key ?: 'new_'.static::DEFAULT_KEY_NAME; |
|
343 | 343 | |
344 | 344 | if (is_array($column)) { |
345 | 345 | foreach ($column as $k => $name) { |
@@ -161,8 +161,8 @@ discard block |
||
161 | 161 | */ |
162 | 162 | protected function prepareValue($key, $record) |
163 | 163 | { |
164 | - $field = $this->fields->first(function (Field $field) use ($key) { |
|
165 | - return in_array($key, (array)$field->column()); |
|
164 | + $field = $this->fields->first(function(Field $field) use ($key) { |
|
165 | + return in_array($key, (array) $field->column()); |
|
166 | 166 | }); |
167 | 167 | |
168 | 168 | if (method_exists($field, 'prepare')) { |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | if (array_key_exists($key, $this->original)) { |
185 | 185 | $values = $this->original[$key]; |
186 | 186 | |
187 | - $this->fields->each(function (Field $field) use ($values) { |
|
187 | + $this->fields->each(function(Field $field) use ($values) { |
|
188 | 188 | $field->setOriginal($values); |
189 | 189 | }); |
190 | 190 | } |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | */ |
200 | 200 | public function fill(array $data, $prefix = '') |
201 | 201 | { |
202 | - $this->fields->each(function (Field $field) use ($data, $prefix) { |
|
202 | + $this->fields->each(function(Field $field) use ($data, $prefix) { |
|
203 | 203 | $field->fill($data, $prefix); |
204 | 204 | }); |
205 | 205 |