We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | return ['name' => Str::replace(' ', '', $field)]; |
116 | 116 | } |
117 | 117 | |
118 | - if (is_array($field) && ! isset($field['name'])) { |
|
118 | + if (is_array($field) && !isset($field['name'])) { |
|
119 | 119 | abort(500, 'All fields must have their name defined'); |
120 | 120 | } |
121 | 121 | |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | } |
190 | 190 | // if there's a model defined, but no attribute |
191 | 191 | // guess an attribute using the identifiableAttribute functionality in CrudTrait |
192 | - if (isset($field['model']) && ! isset($field['attribute']) && method_exists($field['model'], 'identifiableAttribute')) { |
|
192 | + if (isset($field['model']) && !isset($field['attribute']) && method_exists($field['model'], 'identifiableAttribute')) { |
|
193 | 193 | $field['attribute'] = (new $field['model']())->identifiableAttribute(); |
194 | 194 | } |
195 | 195 | |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | */ |
206 | 206 | protected function makeSureFieldHasLabel($field) |
207 | 207 | { |
208 | - if (! isset($field['label'])) { |
|
208 | + if (!isset($field['label'])) { |
|
209 | 209 | $name = str_replace(',', ' ', $field['name']); |
210 | 210 | $name = str_replace('_id', '', $name); |
211 | 211 | $field['label'] = mb_ucfirst(str_replace('_', ' ', $name)); |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | */ |
224 | 224 | protected function makeSureFieldHasType($field) |
225 | 225 | { |
226 | - if (! isset($field['type'])) { |
|
226 | + if (!isset($field['type'])) { |
|
227 | 227 | $field['type'] = isset($field['relation_type']) ? $this->inferFieldTypeFromRelationType($field['relation_type']) : $this->inferFieldTypeFromDbColumnType($field['name']); |
228 | 228 | } |
229 | 229 | |
@@ -256,16 +256,16 @@ discard block |
||
256 | 256 | */ |
257 | 257 | protected function makeSureSubfieldsHaveNecessaryAttributes($field) |
258 | 258 | { |
259 | - if (! isset($field['subfields']) || ! is_array($field['subfields'])) { |
|
259 | + if (!isset($field['subfields']) || !is_array($field['subfields'])) { |
|
260 | 260 | return $field; |
261 | 261 | } |
262 | 262 | |
263 | - if (! is_multidimensional_array($field['subfields'], true)) { |
|
263 | + if (!is_multidimensional_array($field['subfields'], true)) { |
|
264 | 264 | abort(500, 'Subfields of «'.$field['name'].'» are malformed. Make sure you provide an array of subfields.'); |
265 | 265 | } |
266 | 266 | |
267 | 267 | foreach ($field['subfields'] as $key => $subfield) { |
268 | - if (empty($subfield) || ! isset($subfield['name'])) { |
|
268 | + if (empty($subfield) || !isset($subfield['name'])) { |
|
269 | 269 | abort(500, 'A subfield of «'.$field['name'].'» is malformed. Subfield attribute name can\'t be empty.'); |
270 | 270 | } |
271 | 271 | |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | $subfield['baseFieldName'] = is_array($subfield['name']) ? implode(',', $subfield['name']) : $subfield['name']; |
281 | 281 | $subfield['baseFieldName'] = Str::afterLast($subfield['baseFieldName'], '.'); |
282 | 282 | |
283 | - if (! isset($field['model'])) { |
|
283 | + if (!isset($field['model'])) { |
|
284 | 284 | // we're inside a simple 'repeatable' with no model/relationship, so |
285 | 285 | // we assume all subfields are supposed to be text fields |
286 | 286 | $subfield['type'] = $subfield['type'] ?? 'text'; |
@@ -305,11 +305,11 @@ discard block |
||
305 | 305 | case 'BelongsToMany': |
306 | 306 | $pivotSelectorField = static::getPivotFieldStructure($field); |
307 | 307 | |
308 | - $pivot = Arr::where($field['subfields'], function ($item) use ($pivotSelectorField) { |
|
308 | + $pivot = Arr::where($field['subfields'], function($item) use ($pivotSelectorField) { |
|
309 | 309 | return $item['name'] === $pivotSelectorField['name']; |
310 | 310 | }); |
311 | 311 | |
312 | - if (! empty($pivot)) { |
|
312 | + if (!empty($pivot)) { |
|
313 | 313 | break; |
314 | 314 | } |
315 | 315 | |
@@ -322,11 +322,11 @@ discard block |
||
322 | 322 | $entity = isset($field['baseEntity']) ? $field['baseEntity'].'.'.$field['entity'] : $field['entity']; |
323 | 323 | $relationInstance = $this->getRelationInstance(['entity' => $entity]); |
324 | 324 | |
325 | - $localKeyField = Arr::where($field['subfields'], function ($item) use ($relationInstance) { |
|
325 | + $localKeyField = Arr::where($field['subfields'], function($item) use ($relationInstance) { |
|
326 | 326 | return $item['name'] === $relationInstance->getRelated()->getKeyName(); |
327 | 327 | }); |
328 | 328 | |
329 | - if (! empty($localKeyField)) { |
|
329 | + if (!empty($localKeyField)) { |
|
330 | 330 | break; |
331 | 331 | } |
332 | 332 | |
@@ -351,7 +351,7 @@ discard block |
||
351 | 351 | { |
352 | 352 | // if a tab was mentioned, we should enable it |
353 | 353 | if (isset($field['tab'])) { |
354 | - if (! $this->tabsEnabled()) { |
|
354 | + if (!$this->tabsEnabled()) { |
|
355 | 355 | $this->enableTabs(); |
356 | 356 | } |
357 | 357 | } |
@@ -23,8 +23,7 @@ |
||
23 | 23 | } |
24 | 24 | |
25 | 25 | $previousValues = str_contains($attribute, '.') ? |
26 | - (Arr::get($entry?->{Str::before($attribute, '.')} ?? [], Str::after($attribute, '.')) ?? []) : |
|
27 | - ($entry?->{$attribute} ?? []); |
|
26 | + (Arr::get($entry?->{Str::before($attribute, '.')} ?? [], Str::after($attribute, '.')) ?? []) : ($entry?->{$attribute} ?? []); |
|
28 | 27 | |
29 | 28 | if (is_string($previousValues)) { |
30 | 29 | $previousValues = json_decode($previousValues, true) ?? []; |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function markAsHandled(string $objectName): void |
36 | 36 | { |
37 | - if (! in_array($objectName, $this->handledUploaders)) { |
|
37 | + if (!in_array($objectName, $this->handledUploaders)) { |
|
38 | 38 | $this->handledUploaders[] = $objectName; |
39 | 39 | } |
40 | 40 | } |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | */ |
85 | 85 | public function registerRepeatableUploader(string $uploadName, UploaderInterface $uploader): void |
86 | 86 | { |
87 | - if (! array_key_exists($uploadName, $this->repeatableUploaders) || ! in_array($uploader, $this->repeatableUploaders[$uploadName])) { |
|
87 | + if (!array_key_exists($uploadName, $this->repeatableUploaders) || !in_array($uploader, $this->repeatableUploaders[$uploadName])) { |
|
88 | 88 | $this->repeatableUploaders[$uploadName][] = $uploader; |
89 | 89 | } |
90 | 90 | } |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | */ |
119 | 119 | public function getRegisteredUploadNames(string $uploadName): array |
120 | 120 | { |
121 | - return array_map(function ($uploader) { |
|
121 | + return array_map(function($uploader) { |
|
122 | 122 | return $uploader->getName(); |
123 | 123 | }, $this->getRepeatableUploadersFor($uploadName)); |
124 | 124 | } |
@@ -149,11 +149,11 @@ discard block |
||
149 | 149 | |
150 | 150 | $uploaders = $this->getRepeatableUploadersFor($repeatableContainerName); |
151 | 151 | |
152 | - $uploader = Arr::first($uploaders, function ($uploader) use ($requestInputName) { |
|
152 | + $uploader = Arr::first($uploaders, function($uploader) use ($requestInputName) { |
|
153 | 153 | return $uploader->getName() === $requestInputName; |
154 | 154 | }); |
155 | 155 | |
156 | - if (! $uploader) { |
|
156 | + if (!$uploader) { |
|
157 | 157 | abort(500, 'Could not find the field in the repeatable uploaders.'); |
158 | 158 | } |
159 | 159 | |
@@ -164,16 +164,16 @@ discard block |
||
164 | 164 | abort(500, 'Could not find the field in the CRUD fields.'); |
165 | 165 | } |
166 | 166 | |
167 | - if (! $uploaderMacro = $this->getUploadCrudObjectMacroType($crudObject)) { |
|
167 | + if (!$uploaderMacro = $this->getUploadCrudObjectMacroType($crudObject)) { |
|
168 | 168 | abort(500, 'There is no uploader defined for the given field type.'); |
169 | 169 | } |
170 | 170 | |
171 | - if (! $this->isValidUploadField($crudObject, $uploaderMacro)) { |
|
171 | + if (!$this->isValidUploadField($crudObject, $uploaderMacro)) { |
|
172 | 172 | abort(500, 'Invalid field for upload.'); |
173 | 173 | } |
174 | 174 | |
175 | 175 | $uploaderConfiguration = $crudObject[$uploaderMacro] ?? []; |
176 | - $uploaderConfiguration = ! is_array($uploaderConfiguration) ? [] : $uploaderConfiguration; |
|
176 | + $uploaderConfiguration = !is_array($uploaderConfiguration) ? [] : $uploaderConfiguration; |
|
177 | 177 | $uploaderClass = $this->getUploadFor($crudObject['type'], $uploaderMacro); |
178 | 178 | |
179 | 179 | return new $uploaderClass(['name' => $requestInputName], $uploaderConfiguration); |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | /** |
183 | 183 | * Get the upload field macro type for the given object. |
184 | 184 | */ |
185 | - private function getUploadCrudObjectMacroType(array $crudObject): string|null |
|
185 | + private function getUploadCrudObjectMacroType(array $crudObject): string | null |
|
186 | 186 | { |
187 | 187 | return isset($crudObject['withFiles']) ? 'withFiles' : (isset($crudObject['withMedia']) ? 'withMedia' : null); |
188 | 188 | } |
@@ -191,11 +191,11 @@ discard block |
||
191 | 191 | { |
192 | 192 | if (Str::contains($crudObject['name'], '#')) { |
193 | 193 | $container = Str::before($crudObject['name'], '#'); |
194 | - $field = array_filter(CRUD::fields()[$container]['subfields'] ?? [], function ($item) use ($crudObject, $uploaderMacro) { |
|
194 | + $field = array_filter(CRUD::fields()[$container]['subfields'] ?? [], function($item) use ($crudObject, $uploaderMacro) { |
|
195 | 195 | return $item['name'] === $crudObject['name'] && in_array($item['type'], $this->getAjaxUploadTypes($uploaderMacro)); |
196 | 196 | }); |
197 | 197 | |
198 | - return ! empty($field); |
|
198 | + return !empty($field); |
|
199 | 199 | } |
200 | 200 | |
201 | 201 | return in_array($crudObject['type'], $this->getAjaxUploadTypes($uploaderMacro)); |
@@ -29,13 +29,13 @@ discard block |
||
29 | 29 | |
30 | 30 | public bool $implicit = true; |
31 | 31 | |
32 | - public static function field(string|array|ValidationRule|Rule $rules = []): self |
|
32 | + public static function field(string | array | ValidationRule | Rule $rules = []): self |
|
33 | 33 | { |
34 | 34 | $instance = new static(); |
35 | 35 | $instance->fieldRules = self::getRulesAsArray($rules); |
36 | 36 | |
37 | 37 | if ($instance->validatesArrays()) { |
38 | - if (! in_array('array', $instance->getFieldRules())) { |
|
38 | + if (!in_array('array', $instance->getFieldRules())) { |
|
39 | 39 | $instance->fieldRules[] = 'array'; |
40 | 40 | } |
41 | 41 | } |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | |
96 | 96 | public function getFieldRules(): array |
97 | 97 | { |
98 | - return tap($this->fieldRules, function ($rule) { |
|
98 | + return tap($this->fieldRules, function($rule) { |
|
99 | 99 | if (is_a($rule, BackpackCustomRule::class, true)) { |
100 | 100 | $rule = $rule->getFieldRules(); |
101 | 101 | } |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | $rules = explode('|', $rules); |
111 | 111 | } |
112 | 112 | |
113 | - if (! is_array($rules)) { |
|
113 | + if (!is_array($rules)) { |
|
114 | 114 | $rules = [$rules]; |
115 | 115 | } |
116 | 116 | |
@@ -119,10 +119,10 @@ discard block |
||
119 | 119 | |
120 | 120 | protected function ensureValueIsValid($value) |
121 | 121 | { |
122 | - if ($this->validatesArrays() && ! is_array($value)) { |
|
122 | + if ($this->validatesArrays() && !is_array($value)) { |
|
123 | 123 | try { |
124 | 124 | $value = json_decode($value, true) ?? []; |
125 | - } catch(\Exception $e) { |
|
125 | + } catch (\Exception $e) { |
|
126 | 126 | return false; |
127 | 127 | } |
128 | 128 | } |
@@ -141,12 +141,12 @@ discard block |
||
141 | 141 | $attribute => $rules, |
142 | 142 | ], $this->validator->customMessages, $this->getValidatorCustomAttributes($attribute)); |
143 | 143 | |
144 | - return $validator->errors()->messages()[$attribute] ?? (! empty($validator->errors()->messages()) ? current($validator->errors()->messages()) : []); |
|
144 | + return $validator->errors()->messages()[$attribute] ?? (!empty($validator->errors()->messages()) ? current($validator->errors()->messages()) : []); |
|
145 | 145 | } |
146 | 146 | |
147 | 147 | private function getValidatorCustomAttributes(string $attribute): array |
148 | 148 | { |
149 | - if (! is_a($this, ValidGenericAjaxEndpoint::class) && ! Str::contains($attribute, '.*.')) { |
|
149 | + if (!is_a($this, ValidGenericAjaxEndpoint::class) && !Str::contains($attribute, '.*.')) { |
|
150 | 150 | return $this->validator->customAttributes; |
151 | 151 | } |
152 | 152 | |
@@ -157,8 +157,7 @@ discard block |
||
157 | 157 | protected function getValidationAttributeString(string $attribute) |
158 | 158 | { |
159 | 159 | return Str::substrCount($attribute, '.') > 1 ? |
160 | - Str::before($attribute, '.').'.*.'.Str::afterLast($attribute, '.') : |
|
161 | - $attribute; |
|
160 | + Str::before($attribute, '.').'.*.'.Str::afterLast($attribute, '.') : $attribute; |
|
162 | 161 | } |
163 | 162 | |
164 | 163 | protected function validateOnSubmit(string $attribute, mixed $value): array |
@@ -166,7 +165,7 @@ discard block |
||
166 | 165 | return $this->validateRules($attribute, $value); |
167 | 166 | } |
168 | 167 | |
169 | - protected function validateFieldAndFile(string $attribute, null|array $data = null, array|null $customRules = null): array |
|
168 | + protected function validateFieldAndFile(string $attribute, null | array $data = null, array | null $customRules = null): array |
|
170 | 169 | { |
171 | 170 | $fieldErrors = $this->validateFieldRules($attribute, $data, $customRules); |
172 | 171 | |
@@ -178,7 +177,7 @@ discard block |
||
178 | 177 | /** |
179 | 178 | * Implementation. |
180 | 179 | */ |
181 | - public function validateFieldRules(string $attribute, null|array|string|UploadedFile $data = null, array|null $customRules = null): array |
|
180 | + public function validateFieldRules(string $attribute, null | array | string | UploadedFile $data = null, array | null $customRules = null): array |
|
182 | 181 | { |
183 | 182 | $data = $data ?? $this->data; |
184 | 183 | $validationRuleAttribute = $this->getValidationAttributeString($attribute); |
@@ -187,16 +186,16 @@ discard block |
||
187 | 186 | return $this->validateAndGetErrors($validationRuleAttribute, $data, $customRules ?? $this->getFieldRules()); |
188 | 187 | } |
189 | 188 | |
190 | - protected function prepareValidatorData(array|string|UploadedFile $data, string $attribute): array |
|
189 | + protected function prepareValidatorData(array | string | UploadedFile $data, string $attribute): array |
|
191 | 190 | { |
192 | - if ($this->validatesArrays() && is_array($data) && ! Str::contains($attribute, '.')) { |
|
191 | + if ($this->validatesArrays() && is_array($data) && !Str::contains($attribute, '.')) { |
|
193 | 192 | return Arr::has($data, $attribute) ? $data : [$attribute => $data]; |
194 | 193 | } |
195 | 194 | |
196 | 195 | if (Str::contains($attribute, '.')) { |
197 | 196 | $validData = []; |
198 | 197 | |
199 | - Arr::set($validData, $attribute, ! is_array($data) ? $data : Arr::get($data, $attribute)); |
|
198 | + Arr::set($validData, $attribute, !is_array($data) ? $data : Arr::get($data, $attribute)); |
|
200 | 199 | |
201 | 200 | return $validData; |
202 | 201 | } |
@@ -211,7 +210,7 @@ discard block |
||
211 | 210 | $validationRuleAttribute = $this->getValidationAttributeString($attribute); |
212 | 211 | |
213 | 212 | $filesToValidate = Arr::get($items, $attribute); |
214 | - $filesToValidate = is_array($filesToValidate) ? array_filter($filesToValidate, function ($item) { |
|
213 | + $filesToValidate = is_array($filesToValidate) ? array_filter($filesToValidate, function($item) { |
|
215 | 214 | return $item instanceof UploadedFile; |
216 | 215 | }) : (is_a($filesToValidate, UploadedFile::class, true) ? [$filesToValidate] : []); |
217 | 216 |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | |
21 | 21 | // if the attribute is not set in the request, and an entry exists, |
22 | 22 | // we will check if there is a previous value, as this field might not have changed. |
23 | - if (! Arr::has($this->data, $attribute) && $entry) { |
|
23 | + if (!Arr::has($this->data, $attribute) && $entry) { |
|
24 | 24 | if (str_contains($attribute, '.') && get_class($entry) === get_class(CrudPanelFacade::getModel())) { |
25 | 25 | $previousValue = Arr::get($this->data, '_order_'.Str::before($attribute, '.')); |
26 | 26 | $previousValue = Arr::get($previousValue, Str::after($attribute, '.')); |
@@ -37,20 +37,20 @@ discard block |
||
37 | 37 | |
38 | 38 | // if the value is an uploaded file, or the attribute is not |
39 | 39 | // set in the request, we force fill the data with the value |
40 | - if ($value instanceof UploadedFile || ! Arr::has($this->data, $attribute)) { |
|
40 | + if ($value instanceof UploadedFile || !Arr::has($this->data, $attribute)) { |
|
41 | 41 | Arr::set($this->data, $attribute, $value); |
42 | 42 | } |
43 | 43 | |
44 | 44 | $fieldErrors = $this->validateFieldRules($attribute); |
45 | 45 | |
46 | - if (! empty($value) && ! empty($this->getFileRules())) { |
|
46 | + if (!empty($value) && !empty($this->getFileRules())) { |
|
47 | 47 | $fileErrors = $this->validateFileRules($attribute, $value); |
48 | 48 | } |
49 | 49 | |
50 | 50 | return array_merge($fieldErrors, $fileErrors ?? []); |
51 | 51 | } |
52 | 52 | |
53 | - public static function field(string|array|ValidationRule|Rule $rules = []): self |
|
53 | + public static function field(string | array | ValidationRule | Rule $rules = []): self |
|
54 | 54 | { |
55 | 55 | return parent::field($rules); |
56 | 56 | } |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | { |
15 | 15 | public bool $handleRepeatableFiles = false; |
16 | 16 | |
17 | - public null|string $repeatableContainerName = null; |
|
17 | + public null | string $repeatableContainerName = null; |
|
18 | 18 | |
19 | 19 | /******************************* |
20 | 20 | * Setters - fluently configure the uploader |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | /******************************* |
32 | 32 | * Getters |
33 | 33 | *******************************/ |
34 | - public function getRepeatableContainerName(): null|string |
|
34 | + public function getRepeatableContainerName(): null | string |
|
35 | 35 | { |
36 | 36 | return $this->repeatableContainerName; |
37 | 37 | } |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | foreach (app('UploadersRepository')->getRepeatableUploadersFor($this->getRepeatableContainerName()) as $uploader) { |
139 | 139 | $uploadedValues = $uploader->uploadRepeatableFiles($values->pluck($uploader->getAttributeName())->toArray(), $this->getPreviousRepeatableValues($entry, $uploader)); |
140 | 140 | |
141 | - $values = $values->map(function ($item, $key) use ($uploadedValues, $uploader) { |
|
141 | + $values = $values->map(function($item, $key) use ($uploadedValues, $uploader) { |
|
142 | 142 | $item[$uploader->getAttributeName()] = $uploadedValues[$key] ?? null; |
143 | 143 | |
144 | 144 | return $item; |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | |
159 | 159 | $values = $entry->{$this->getRepeatableContainerName()}; |
160 | 160 | $values = is_string($values) ? json_decode($values, true) : $values; |
161 | - $values = array_map(function ($item) use ($repeatableUploaders) { |
|
161 | + $values = array_map(function($item) use ($repeatableUploaders) { |
|
162 | 162 | foreach ($repeatableUploaders as $upload) { |
163 | 163 | $item[$upload->getAttributeName()] = $this->getValuesWithPathStripped($item, $upload); |
164 | 164 | } |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | |
174 | 174 | private function retrieveRepeatableRelationFiles(Model $entry) |
175 | 175 | { |
176 | - switch($this->getRepeatableRelationType()) { |
|
176 | + switch ($this->getRepeatableRelationType()) { |
|
177 | 177 | case 'BelongsToMany': |
178 | 178 | case 'MorphToMany': |
179 | 179 | $pivotClass = app('crud')->getModel()->{$this->getUploaderSubfield()['baseEntity']}()->getPivotClass(); |
@@ -219,12 +219,12 @@ discard block |
||
219 | 219 | |
220 | 220 | $repeatableValues = collect($entry->{$this->getName()}); |
221 | 221 | foreach (app('UploadersRepository')->getRepeatableUploadersFor($this->getRepeatableContainerName()) as $upload) { |
222 | - if (! $upload->shouldDeleteFiles()) { |
|
222 | + if (!$upload->shouldDeleteFiles()) { |
|
223 | 223 | continue; |
224 | 224 | } |
225 | 225 | $values = $repeatableValues->pluck($upload->getName())->toArray(); |
226 | 226 | foreach ($values as $value) { |
227 | - if (! $value) { |
|
227 | + if (!$value) { |
|
228 | 228 | continue; |
229 | 229 | } |
230 | 230 | |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | /** |
248 | 248 | * Given two multidimensional arrays/collections, merge them recursively. |
249 | 249 | */ |
250 | - protected function mergeValuesRecursive(array|Collection $array1, array|Collection $array2): array|Collection |
|
250 | + protected function mergeValuesRecursive(array | Collection $array1, array | Collection $array2): array | Collection |
|
251 | 251 | { |
252 | 252 | $merged = $array1; |
253 | 253 | foreach ($array2 as $key => &$value) { |
@@ -269,7 +269,7 @@ discard block |
||
269 | 269 | { |
270 | 270 | $items = CRUD::getRequest()->input('_order_'.$this->getRepeatableContainerName()) ?? []; |
271 | 271 | |
272 | - array_walk($items, function (&$key, $value) { |
|
272 | + array_walk($items, function(&$key, $value) { |
|
273 | 273 | $requestValue = $key[$this->getName()] ?? null; |
274 | 274 | $key = $this->handleMultipleFiles ? (is_string($requestValue) ? explode(',', $requestValue) : $requestValue) : $requestValue; |
275 | 275 | }); |
@@ -281,22 +281,22 @@ discard block |
||
281 | 281 | { |
282 | 282 | $previousValues = $entry->getOriginal($uploader->getRepeatableContainerName()); |
283 | 283 | |
284 | - if (! is_array($previousValues)) { |
|
284 | + if (!is_array($previousValues)) { |
|
285 | 285 | $previousValues = json_decode($previousValues, true); |
286 | 286 | } |
287 | 287 | |
288 | - if (! empty($previousValues)) { |
|
288 | + if (!empty($previousValues)) { |
|
289 | 289 | $previousValues = array_column($previousValues, $uploader->getName()); |
290 | 290 | } |
291 | 291 | |
292 | 292 | return $previousValues ?? []; |
293 | 293 | } |
294 | 294 | |
295 | - private function getValuesWithPathStripped(array|string|null $item, UploaderInterface $uploader) |
|
295 | + private function getValuesWithPathStripped(array | string | null $item, UploaderInterface $uploader) |
|
296 | 296 | { |
297 | 297 | $uploadedValues = $item[$uploader->getName()] ?? null; |
298 | 298 | if (is_array($uploadedValues)) { |
299 | - return array_map(function ($value) use ($uploader) { |
|
299 | + return array_map(function($value) use ($uploader) { |
|
300 | 300 | return $uploader->getValueWithoutPath($value); |
301 | 301 | }, $uploadedValues); |
302 | 302 | } |
@@ -315,19 +315,19 @@ discard block |
||
315 | 315 | { |
316 | 316 | if (in_array($this->getRepeatableRelationType(), ['BelongsToMany', 'MorphToMany'])) { |
317 | 317 | $pivotAttributes = $entry->getAttributes(); |
318 | - $connectedPivot = $entry->pivotParent->{$this->getRepeatableContainerName()}->where(function ($item) use ($pivotAttributes) { |
|
318 | + $connectedPivot = $entry->pivotParent->{$this->getRepeatableContainerName()}->where(function($item) use ($pivotAttributes) { |
|
319 | 319 | $itemPivotAttributes = $item->pivot->only(array_keys($pivotAttributes)); |
320 | 320 | |
321 | 321 | return $itemPivotAttributes === $pivotAttributes; |
322 | 322 | })->first(); |
323 | 323 | |
324 | - if (! $connectedPivot) { |
|
324 | + if (!$connectedPivot) { |
|
325 | 325 | return; |
326 | 326 | } |
327 | 327 | |
328 | 328 | $files = $connectedPivot->getOriginal()['pivot_'.$this->getAttributeName()]; |
329 | 329 | |
330 | - if (! $files) { |
|
330 | + if (!$files) { |
|
331 | 331 | return; |
332 | 332 | } |
333 | 333 |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | |
11 | 11 | class MultipleFiles extends Uploader |
12 | 12 | { |
13 | - public static function for(array $field, $configuration): UploaderInterface |
|
13 | + public static function for (array $field, $configuration): UploaderInterface |
|
14 | 14 | { |
15 | 15 | return (new self($field, $configuration))->multiple(); |
16 | 16 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | $previousFiles = []; |
30 | 30 | } |
31 | 31 | |
32 | - if (! is_array($previousFiles) && is_string($previousFiles)) { |
|
32 | + if (!is_array($previousFiles) && is_string($previousFiles)) { |
|
33 | 33 | $previousFiles = json_decode($previousFiles, true); |
34 | 34 | } |
35 | 35 | |
@@ -38,14 +38,14 @@ discard block |
||
38 | 38 | if (in_array($previousFile, $filesToDelete)) { |
39 | 39 | Storage::disk($this->getDisk())->delete($previousFile); |
40 | 40 | |
41 | - $previousFiles = Arr::where($previousFiles, function ($value, $key) use ($previousFile) { |
|
41 | + $previousFiles = Arr::where($previousFiles, function($value, $key) use ($previousFile) { |
|
42 | 42 | return $value != $previousFile; |
43 | 43 | }); |
44 | 44 | } |
45 | 45 | } |
46 | 46 | } |
47 | 47 | |
48 | - if (! is_array($value)) { |
|
48 | + if (!is_array($value)) { |
|
49 | 49 | $value = []; |
50 | 50 | } |
51 | 51 | |
@@ -82,13 +82,13 @@ discard block |
||
82 | 82 | // create a temporary variable that we can unset keys |
83 | 83 | // everytime one is found. That way we avoid iterating |
84 | 84 | // already handled keys (notice we do a deep array copy) |
85 | - $tempFileOrder = array_map(function ($item) { |
|
85 | + $tempFileOrder = array_map(function($item) { |
|
86 | 86 | return $item; |
87 | 87 | }, $fileOrder); |
88 | 88 | |
89 | 89 | foreach ($previousRepeatableValues as $previousRow => $previousFiles) { |
90 | 90 | foreach ($previousFiles ?? [] as $key => $file) { |
91 | - $previousFileInArray = array_filter($tempFileOrder, function ($items, $key) use ($file, $tempFileOrder) { |
|
91 | + $previousFileInArray = array_filter($tempFileOrder, function($items, $key) use ($file, $tempFileOrder) { |
|
92 | 92 | $found = array_search($file, $items ?? [], true); |
93 | 93 | if ($found !== false) { |
94 | 94 | Arr::forget($tempFileOrder, $key.'.'.$found); |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | |
99 | 99 | return false; |
100 | 100 | }, ARRAY_FILTER_USE_BOTH); |
101 | - if ($file && ! $previousFileInArray) { |
|
101 | + if ($file && !$previousFileInArray) { |
|
102 | 102 | Storage::disk($this->getDisk())->delete($file); |
103 | 103 | } |
104 | 104 | } |