View GitHub Repository laravel-admin

Schedule Inspection
Subscribe
Completed
Pull Request — master (#2901)
by
unknown
02:22
created
Status
Category
Toggle Patches
src/Form/Field/Embeds.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch 
@@ -61,28 +61,28 @@  discard block
 
 block discarded – undo
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) {
 
@@ -126,13 +126,13 @@  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));
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
 
 block discarded – undo
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,12 +163,12 @@  discard block
 
 block discarded – undo
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 174 
                         $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : '';
 
@@ -187,12 +187,12 @@  discard block
 
 block discarded – undo
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 
                     }
Please login to merge, or discard this patch.
src/Form/Field/HasMany.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch 
@@ -100,28 +100,28 @@  discard block
 
 block discarded – undo
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
 
 block discarded – undo
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);
 
@@ -155,15 +155,15 @@  discard block
 
 block discarded – undo
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
 
 block discarded – undo
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,12 +193,12 @@  discard block
 
 block discarded – undo
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 204 
                         $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : '';
 
@@ -217,12 +217,12 @@  discard block
 
 block discarded – undo
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 
                     }
Please login to merge, or discard this patch.