@@ -81,9 +81,10 @@ discard block |
||
81 | 81 | }; |
82 | 82 | |
83 | 83 | $array_key_clean_undot = function (array $a) { |
84 | - if (count($a)) |
|
85 | - foreach ($a as $key => $val) { |
|
84 | + if (count($a)) { |
|
85 | + foreach ($a as $key => $val) { |
|
86 | 86 | array_set($a, str_replace(':', '', $key), $val); |
87 | + } |
|
87 | 88 | if (preg_match('/[\.\:]/', $key)) { |
88 | 89 | unset($a[$key]); |
89 | 90 | } |
@@ -150,10 +151,13 @@ discard block |
||
150 | 151 | list($rel, $col) = explode('.', $v); |
151 | 152 | //Fix ResetInput Function! A Headache Implementation! |
152 | 153 | $col1 = explode(':', $col)[0]; |
153 | - if (!array_key_exists($col1, $availInput[$rel])) return [null => null]; |
|
154 | + if (!array_key_exists($col1, $availInput[$rel])) { |
|
155 | + return [null => null]; |
|
156 | + } |
|
154 | 157 | $rows = $availInput[$rel][$col1]; |
155 | - if (!is_array($rows)) |
|
156 | - return $array_key_attach_str($field->validationMessages, $v); |
|
158 | + if (!is_array($rows)) { |
|
159 | + return $array_key_attach_str($field->validationMessages, $v); |
|
160 | + } |
|
157 | 161 | $r = []; |
158 | 162 | foreach (array_keys($rows) as $k) { |
159 | 163 | $k = "{$v}{$k}"; |
@@ -173,7 +177,9 @@ discard block |
||
173 | 177 | list($rel, $col) = explode('.', $idx); |
174 | 178 | //Fix ResetInput Function! A Headache Implementation! |
175 | 179 | $col1 = explode(':', $col)[0]; |
176 | - if (!array_key_exists($col1, $availInput[$rel])) return [null => null]; |
|
180 | + if (!array_key_exists($col1, $availInput[$rel])) { |
|
181 | + return [null => null]; |
|
182 | + } |
|
177 | 183 | if (is_array($availInput[$rel][$col1])) { |
178 | 184 | return call_user_func_array('array_merge', array_map(function ($x, $y) use ($idx) { |
179 | 185 | return ["{$idx}{$x}" => $y]; |
@@ -187,7 +193,9 @@ discard block |
||
187 | 193 | list($rel, $col) = explode('.', $idx); |
188 | 194 | //Fix ResetInput Function! A Headache Implementation! |
189 | 195 | $col1 = explode(':', $col)[0]; |
190 | - if (!array_key_exists($col1, $availInput[$rel])) return [null => null]; |
|
196 | + if (!array_key_exists($col1, $availInput[$rel])) { |
|
197 | + return [null => null]; |
|
198 | + } |
|
191 | 199 | if (is_array($availInput[$rel][$col1])) { |
192 | 200 | return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $rules) { |
193 | 201 | return ["{$idx}{$x}" => $rules[$idx]]; |
@@ -203,11 +211,14 @@ discard block |
||
203 | 211 | list($rel, $col) = explode('.', $idx); |
204 | 212 | //Fix ResetInput Function! A Headache Implementation! |
205 | 213 | $col1 = explode(':', $col)[0]; |
206 | - if (!array_key_exists($col1, $availInput[$rel])) return [null => null]; |
|
214 | + if (!array_key_exists($col1, $availInput[$rel])) { |
|
215 | + return [null => null]; |
|
216 | + } |
|
207 | 217 | if (is_array($availInput[$rel][$col1])) { |
208 | - if (array_keys($availInput[$rel][$col1])) |
|
209 | - return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $attributes) { |
|
218 | + if (array_keys($availInput[$rel][$col1])) { |
|
219 | + return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $attributes) { |
|
210 | 220 | return ["{$idx}.{$x}" => $attributes[$idx]]; |
221 | + } |
|
211 | 222 | }, array_keys($availInput[$rel][$col1]))); |
212 | 223 | return [null => null]; |
213 | 224 | } |
@@ -118,9 +118,10 @@ discard block |
||
118 | 118 | }; |
119 | 119 | |
120 | 120 | $array_key_clean_undot = function (array $a) { |
121 | - if (count($a)) |
|
122 | - foreach ($a as $key => $val) { |
|
121 | + if (count($a)) { |
|
122 | + foreach ($a as $key => $val) { |
|
123 | 123 | array_set($a, str_replace(':', '', $key), $val); |
124 | + } |
|
124 | 125 | if (preg_match('/[\.\:]/', $key)) { |
125 | 126 | unset($a[$key]); |
126 | 127 | } |
@@ -184,10 +185,13 @@ discard block |
||
184 | 185 | list($r, $k, $c) = explode('.', $v); |
185 | 186 | //Fix ResetInput Function! A Headache Implementation! |
186 | 187 | $col1 = explode(':', $c)[0]; |
187 | - if (!array_key_exists($col1, $availInput[$k])) return [null => null]; |
|
188 | + if (!array_key_exists($col1, $availInput[$k])) { |
|
189 | + return [null => null]; |
|
190 | + } |
|
188 | 191 | $rows = $availInput[$k][$col1]; |
189 | - if (!is_array($rows)) |
|
190 | - return $array_key_attach_str($field->validationMessages, $v); |
|
192 | + if (!is_array($rows)) { |
|
193 | + return $array_key_attach_str($field->validationMessages, $v); |
|
194 | + } |
|
191 | 195 | $r = []; |
192 | 196 | foreach (array_keys($rows) as $k) { |
193 | 197 | $k = "{$v}{$k}"; |
@@ -209,7 +213,9 @@ discard block |
||
209 | 213 | $idx = "{$rel}.{$key}.{$col}"; |
210 | 214 | //Fix ResetInput Function! A Headache Implementation! |
211 | 215 | $col1 = explode(':', $col)[0]; |
212 | - if (!array_key_exists($col1, $availInput[$key])) return [null => null]; |
|
216 | + if (!array_key_exists($col1, $availInput[$key])) { |
|
217 | + return [null => null]; |
|
218 | + } |
|
213 | 219 | if (is_array($availInput[$key][$col1])) { |
214 | 220 | return call_user_func_array('array_merge', array_map(function ($x, $y) use ($idx) { |
215 | 221 | return ["{$idx}{$x}" => $y]; |
@@ -224,7 +230,9 @@ discard block |
||
224 | 230 | $idx = "{$rel}.{$key}.{$col}"; |
225 | 231 | //Fix ResetInput Function! A Headache Implementation! |
226 | 232 | $col1 = explode(':', $col)[0]; |
227 | - if (!array_key_exists($col1, $availInput[$key])) return [null => null]; |
|
233 | + if (!array_key_exists($col1, $availInput[$key])) { |
|
234 | + return [null => null]; |
|
235 | + } |
|
228 | 236 | if (is_array($availInput[$key][$col1])) { |
229 | 237 | return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $rules) { |
230 | 238 | return ["{$idx}{$x}" => $rules[$idx]]; |
@@ -241,11 +249,14 @@ discard block |
||
241 | 249 | $idx = "{$rel}.{$key}.{$col}"; |
242 | 250 | //Fix ResetInput Function! A Headache Implementation! |
243 | 251 | $col1 = explode(':', $col)[0]; |
244 | - if (!array_key_exists($col1, $availInput[$key])) return [null => null]; |
|
252 | + if (!array_key_exists($col1, $availInput[$key])) { |
|
253 | + return [null => null]; |
|
254 | + } |
|
245 | 255 | if (is_array($availInput[$key][$col1])) { |
246 | - if (array_keys($availInput[$key][$col1])) |
|
247 | - return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $attributes) { |
|
256 | + if (array_keys($availInput[$key][$col1])) { |
|
257 | + return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $attributes) { |
|
248 | 258 | return ["{$idx}.{$x}" => $attributes[$idx]]; |
259 | + } |
|
249 | 260 | }, array_keys($availInput[$key][$col1]))); |
250 | 261 | return [null => null]; |
251 | 262 | } |