View GitHub Repository laravel-admin

Schedule Inspection
Subscribe
Completed
Pull Request — master (#2901)
by
unknown
02:19
created
Status
Category
Toggle Patches
src/Form/Field/Embeds.php 2 patches
Spacing   +20 added lines, -20 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);
 
@@ -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,13 +133,13 @@  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 145 
                     $u .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[1])[0].']' : '';
 
@@ -149,7 +149,7 @@  discard block
 
 block discarded – undo
149 149 
             ));
150 150 
             if ($field->validationMessages) {
151 151
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
 
 block discarded – undo
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
 
 block discarded – undo
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,13 +193,13 @@  discard block
 
 block discarded – undo
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];
200 200 
             if (!array_key_exists($col1, $availInput[$rel])) return [null => null];
201 201 
             if (is_array($availInput[$rel][$col1])) {
202 
-                return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $rules) {
202 
+                return call_user_func_array('array_merge', array_map(function($x) use ($idx, $rules) {
203 203 
                     return ["{$idx}{$x}" => $rules[$idx]];
204 204 
                 }, array_keys($availInput[$rel][$col1])));
205 205 
             }
 
@@ -207,9 +207,9 @@  discard block
 
 block discarded – undo
207 207
208 208 
         }, array_keys($rules));
209 209 
         $newRules = array_filter(call_user_func_array('array_merge', $newRules), 'strlen', ARRAY_FILTER_USE_KEY);
210 
-        $newRules = $array_key_clean($newRules);;
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.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -197,7 +197,9 @@  discard block
 
 block discarded – undo
197 197 
             list($rel, $col) = explode('.', $idx);
198 198 
             //Fix ResetInput Function! A Headache Implementation!
199 199 
             $col1 = explode(':', $col)[0];
200 
-            if (!array_key_exists($col1, $availInput[$rel])) return [null => null];
200 
+            if (!array_key_exists($col1, $availInput[$rel])) {
201 
+                return [null => null];
202 
+            }
201 203 
             if (is_array($availInput[$rel][$col1])) {
202 204 
                 return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $rules) {
203 205 
                     return ["{$idx}{$x}" => $rules[$idx]];
 
@@ -217,9 +219,10 @@  discard block
 
 block discarded – undo
217 219 
                 return [null => null];
218 220 
             }
219 221 
             if (is_array($availInput[$rel][$col1])) {
220 
-                if (array_keys($availInput[$rel][$col1]))
221 
-                    return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $attributes) {
222 
+                if (array_keys($availInput[$rel][$col1])) {
223 
+                                    return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $attributes) {
222 224 
                     return ["{$idx}.{$x}" => $attributes[$idx]];
225 
+                }
223 226 
                 }, array_keys($availInput[$rel][$col1])));
224 227
225 228 
                 return [null => null];
Please login to merge, or discard this patch.
src/Form/Field/HasMany.php 2 patches
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);
 
@@ -158,8 +158,8 @@  discard block
 
 block discarded – undo
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,23 +168,23 @@  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 186
187 
-                $newMessages = array_map(function ($v) use ($field, $availInput, $array_key_attach_str) {
187 
+                $newMessages = array_map(function($v) use ($field, $availInput, $array_key_attach_str) {
188 188 
                     list($r, $k, $c) = explode('.', $v);
189 189 
                     //Fix ResetInput Function! A Headache Implementation!
190 190 
                     $col1 = explode(':', $c)[0];
 
@@ -211,7 +211,7 @@  discard block
 
 block discarded – undo
211 211 
             return false;
212 212 
         }
213 213
214 
-        $newInput = call_user_func_array('array_merge', array_map(function ($u) use ($availInput) {
214 
+        $newInput = call_user_func_array('array_merge', array_map(function($u) use ($availInput) {
215 215 
             list($rel, $key, $col) = explode('.', $u);
216 216 
             $idx = "{$rel}.{$key}.{$col}";
217 217 
             //Fix ResetInput Function! A Headache Implementation!
 
@@ -220,7 +220,7 @@  discard block
 
 block discarded – undo
220 220 
                 return [null => null];
221 221 
             }
222 222 
             if (is_array($availInput[$key][$col1])) {
223 
-                return call_user_func_array('array_merge', array_map(function ($x, $y) use ($idx) {
223 
+                return call_user_func_array('array_merge', array_map(function($x, $y) use ($idx) {
224 224 
                     return ["{$idx}{$x}" => $y];
225 225 
                 }, array_keys($availInput[$key][$col1]), $availInput[$key][$col1]));
226 226 
             }
 
@@ -228,7 +228,7 @@  discard block
 
 block discarded – undo
228 228 
         }, array_keys($rules)));
229 229 
         $newInput = $array_key_clean_undot($newInput);
230 230
231 
-        $newRules = array_map(function ($u) use ($availInput, $rules) {
231 
+        $newRules = array_map(function($u) use ($availInput, $rules) {
232 232 
             list($rel, $key, $col) = explode('.', $u);
233 233 
             $idx = "{$rel}.{$key}.{$col}";
234 234 
             //Fix ResetInput Function! A Headache Implementation!
 
@@ -237,7 +237,7 @@  discard block
 
 block discarded – undo
237 237 
                 return [null => null];
238 238 
             }
239 239 
             if (is_array($availInput[$key][$col1])) {
240 
-                return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $rules) {
240 
+                return call_user_func_array('array_merge', array_map(function($x) use ($idx, $rules) {
241 241 
                     return ["{$idx}{$x}" => $rules[$idx]];
242 242 
                 }, array_keys($availInput[$key][$col1])));
243 243 
             }
 
@@ -246,9 +246,9 @@  discard block
 
 block discarded – undo
246 246
247 247 
         }, array_keys($rules));
248 248 
         $newRules = array_filter(call_user_func_array('array_merge', $newRules), 'strlen', ARRAY_FILTER_USE_KEY);
249 
-        $newRules = $array_key_clean($newRules);;
249 
+        $newRules = $array_key_clean($newRules); ;
250 250
251 
-        $newAttributes = array_map(function ($u) use ($availInput, $attributes) {
251 
+        $newAttributes = array_map(function($u) use ($availInput, $attributes) {
252 252 
             list($rel, $key, $col) = explode('.', $u);
253 253 
             $idx = "{$rel}.{$key}.{$col}";
254 254 
             //Fix ResetInput Function! A Headache Implementation!
 
@@ -258,7 +258,7 @@  discard block
 
 block discarded – undo
258 258 
             }
259 259 
             if (is_array($availInput[$key][$col1])) {
260 260 
                 if (array_keys($availInput[$key][$col1]))
261 
-                    return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $attributes) {
261 
+                    return call_user_func_array('array_merge', array_map(function($x) use ($idx, $attributes) {
262 262 
                     return ["{$idx}.{$x}" => $attributes[$idx]];
263 263 
                 }, array_keys($availInput[$key][$col1])));
264 264 
 
@@ -293,7 +293,7 @@  discard block
 
 block discarded – undo
293 293
294 294 
         if (is_array($column)) {
295 295 
             foreach ($column as $index => $col) {
296 
-                $new[$col . $index] = $col;
296 
+                $new[$col.$index] = $col;
297 297 
             }
298 298 
         }
299 299 
 
@@ -305,7 +305,7 @@  discard block
 
 block discarded – undo
305 305 
             } else {
306 306 
                 foreach ($new as $k => $val) {
307 307 
                     if (Str::endsWith($key, ".$k")) {
308 
-                        $attributes[$key] = $label . "[$val]";
308 
+                        $attributes[$key] = $label."[$val]";
309 309 
                     }
310 310 
                 }
311 311 
             }
 
@@ -364,7 +364,7 @@  discard block
 
 block discarded – undo
364 364 
                  *
365 365 
                  * I don't know why a form need range input? Only can imagine is for range search....
366 366 
                  */
367 
-                $newKey = $name . $column[$name];
367 
+                $newKey = $name.$column[$name];
368 368
369 369 
                 /*
370 370 
                  * set new key
 
@@ -516,7 +516,7 @@  discard block
 
 block discarded – undo
516 516 
      */
517 517 
     protected function setupScript($script)
518 518 
     {
519 
-        $method = 'setupScriptFor' . ucfirst($this->viewMode) . 'View';
519 
+        $method = 'setupScriptFor'.ucfirst($this->viewMode).'View';
520 520
521 521 
         call_user_func([$this, $method], $script);
522 522 
     }
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -257,9 +257,10 @@
 
 block discarded – undo
257 257 
                 return [null => null];
258 258 
             }
259 259 
             if (is_array($availInput[$key][$col1])) {
260 
-                if (array_keys($availInput[$key][$col1]))
261 
-                    return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $attributes) {
260 
+                if (array_keys($availInput[$key][$col1])) {
261 
+                                    return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $attributes) {
262 262 
                     return ["{$idx}.{$x}" => $attributes[$idx]];
263 
+                }
263 264 
                 }, array_keys($availInput[$key][$col1])));
264 265
265 266 
                 return [null => null];
Please login to merge, or discard this patch.