View GitHub Repository laravel-admin

Schedule Inspection
Subscribe
Completed
Pull Request — master (#2901)
by
unknown
03:42 queued 01:24
created
Status
Category
Toggle Patches
src/Form/Field/HasMany.php 1 patch
Spacing   +17 added lines, -17 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 
             $keys = preg_grep('/[\.\:]/', array_keys($a));
123 123 
             if ($keys) {
124 124 
                 foreach ($keys as $key) {
 
@@ -136,7 +136,7 @@  discard block
 
 block discarded – undo
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);
 
@@ -157,8 +157,8 @@  discard block
 
 block discarded – undo
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}" : "{$rel}.{$u}.{$v}:{$k}";
164 164 
                 }, array_keys($columns), array_values($columns));
 
@@ -167,13 +167,13 @@  discard block
 
 block discarded – undo
167 167 
             $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules;
168 168 
             $rules = array_merge($rules, call_user_func_array(
169 169 
                 'array_merge',
170 
-                array_map(function ($v) use ($fieldRules) {
170 
+                array_map(function($v) use ($fieldRules) {
171 171 
                     return [$v => $fieldRules];
172 172 
                 }, $newColumn)
173 173 
             ));
174 174 
             $attributes = array_merge($attributes, call_user_func_array(
175 175 
                 'array_merge',
176 
-                array_map(function ($v) use ($field) {
176 
+                array_map(function($v) use ($field) {
177 177 
                     //Fix ResetInput Function! A Headache Implementation!
178 178 
                     $u = $field->label();
179 179 
                     $u .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[1])[0].']' : '';
 
@@ -182,7 +182,7 @@  discard block
 
 block discarded – undo
182 182 
                 }, $newColumn)
183 183 
             ));
184 184 
             if ($field->validationMessages) {
185 
-                $newMessages = array_map(function ($v) use ($field, $availInput, $array_key_attach_str) {
185 
+                $newMessages = array_map(function($v) use ($field, $availInput, $array_key_attach_str) {
186 186 
                     list($r, $k, $c) = explode('.', $v);
187 187 
                     //Fix ResetInput Function! A Headache Implementation!
188 188 
                     $col1 = explode(':', $c)[0];
 
@@ -210,7 +210,7 @@  discard block
 
 block discarded – undo
210 210 
             return false;
211 211 
         }
212 212
213 
-        $newInput = call_user_func_array('array_merge', array_map(function ($u) use ($availInput) {
213 
+        $newInput = call_user_func_array('array_merge', array_map(function($u) use ($availInput) {
214 214 
             list($rel, $key, $col) = explode('.', $u);
215 215 
             $idx = "{$rel}.{$key}.{$col}";
216 216 
             //Fix ResetInput Function! A Headache Implementation!
 
@@ -219,7 +219,7 @@  discard block
 
 block discarded – undo
219 219 
                 return [null => null];
220 220 
             }
221 221 
             if (is_array($availInput[$key][$col1])) {
222 
-                return call_user_func_array('array_merge', array_map(function ($x, $y) use ($idx) {
222 
+                return call_user_func_array('array_merge', array_map(function($x, $y) use ($idx) {
223 223 
                     return ["{$idx}{$x}" => $y];
224 224 
                 }, array_keys($availInput[$key][$col1]), $availInput[$key][$col1]));
225 225 
             }
 
@@ -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 
             }
 
@@ -247,7 +247,7 @@  discard block
 
 block discarded – undo
247 247 
         $newRules = array_filter(call_user_func_array('array_merge', $newRules), 'strlen', ARRAY_FILTER_USE_KEY);
248 248 
         $newRules = $array_key_clean($newRules);
249 249
250 
-        $newAttributes = array_map(function ($u) use ($availInput, $attributes) {
250 
+        $newAttributes = array_map(function($u) use ($availInput, $attributes) {
251 251 
             list($rel, $key, $col) = explode('.', $u);
252 252 
             $idx = "{$rel}.{$key}.{$col}";
253 253 
             //Fix ResetInput Function! A Headache Implementation!
 
@@ -257,7 +257,7 @@  discard block
 
 block discarded – undo
257 257 
             }
258 258 
             if (is_array($availInput[$key][$col1])) {
259 259 
                 if (array_keys($availInput[$key][$col1])) {
260 
-                    return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $attributes) {
260 
+                    return call_user_func_array('array_merge', array_map(function($x) use ($idx, $attributes) {
261 261 
                         return ["{$idx}.{$x}" => $attributes[$idx]];
262 262 
                     }, array_keys($availInput[$key][$col1])));
263 263 
                 }
Please login to merge, or discard this patch.
src/Form/Field/Embeds.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch 
@@ -64,24 +64,24 @@  discard block
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 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,7 +193,7 @@  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];
 
@@ -201,7 +201,7 @@  discard block
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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 
                 }
Please login to merge, or discard this patch.