We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -14,18 +14,18 @@ discard block |
||
14 | 14 | private string $crudObjectType; |
15 | 15 | |
16 | 16 | public function __construct( |
17 | - private readonly CrudField|CrudColumn $crudObject, |
|
17 | + private readonly CrudField | CrudColumn $crudObject, |
|
18 | 18 | private readonly array $uploaderConfiguration, |
19 | 19 | private readonly string $macro |
20 | 20 | ) { |
21 | 21 | $this->crudObjectType = is_a($crudObject, CrudField::class) ? 'field' : (is_a($crudObject, CrudColumn::class) ? 'column' : null); |
22 | 22 | |
23 | - if (! $this->crudObjectType) { |
|
23 | + if (!$this->crudObjectType) { |
|
24 | 24 | abort(500, 'Upload handlers only work for CrudField and CrudColumn classes.'); |
25 | 25 | } |
26 | 26 | } |
27 | 27 | |
28 | - public static function handle(CrudField|CrudColumn $crudObject, array $uploaderConfiguration, string $macro, ?array $subfield = null, ?bool $registerModelEvents = true): void |
|
28 | + public static function handle(CrudField | CrudColumn $crudObject, array $uploaderConfiguration, string $macro, ?array $subfield = null, ?bool $registerModelEvents = true): void |
|
29 | 29 | { |
30 | 30 | $instance = new self($crudObject, $uploaderConfiguration, $macro); |
31 | 31 | |
@@ -35,9 +35,9 @@ discard block |
||
35 | 35 | /******************************* |
36 | 36 | * Private methods - implementation |
37 | 37 | *******************************/ |
38 | - private function registerEvents(array|null $subfield = [], ?bool $registerModelEvents = true): void |
|
38 | + private function registerEvents(array | null $subfield = [], ?bool $registerModelEvents = true): void |
|
39 | 39 | { |
40 | - if (! empty($subfield)) { |
|
40 | + if (!empty($subfield)) { |
|
41 | 41 | $this->registerSubfieldEvent($subfield, $registerModelEvents); |
42 | 42 | |
43 | 43 | return; |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | } |
83 | 83 | |
84 | 84 | $subfields = collect($this->crudObject->getAttributes()['subfields']); |
85 | - $subfields = $subfields->map(function ($item) use ($subfield, $uploader) { |
|
85 | + $subfields = $subfields->map(function($item) use ($subfield, $uploader) { |
|
86 | 86 | if ($item['name'] === $subfield['name']) { |
87 | 87 | $item['upload'] = true; |
88 | 88 | $item['disk'] = $uploader->getDisk(); |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | } |
113 | 113 | |
114 | 114 | if ($this->crudObjectType === 'field') { |
115 | - $model::saving(function ($entry) use ($uploader) { |
|
115 | + $model::saving(function($entry) use ($uploader) { |
|
116 | 116 | $entry = $uploader->storeUploadedFiles($entry); |
117 | 117 | }); |
118 | 118 | } |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | // is not called in pivot models when loading the relations. |
126 | 126 | $retrieveModel = $this->getModelForRetrieveEvent($model, $uploader); |
127 | 127 | |
128 | - $retrieveModel::retrieved(function ($entry) use ($uploader) { |
|
128 | + $retrieveModel::retrieved(function($entry) use ($uploader) { |
|
129 | 129 | if ($entry->translationEnabled()) { |
130 | 130 | $locale = request('_locale', app()->getLocale()); |
131 | 131 | if (in_array($locale, array_keys($entry->getAvailableLocales()))) { |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | }); |
137 | 137 | } |
138 | 138 | |
139 | - $model::deleting(function ($entry) use ($uploader) { |
|
139 | + $model::deleting(function($entry) use ($uploader) { |
|
140 | 140 | $uploader->deleteUploadedFiles($entry); |
141 | 141 | }); |
142 | 142 | |
@@ -157,18 +157,18 @@ discard block |
||
157 | 157 | { |
158 | 158 | $hasCustomUploader = isset($uploaderConfiguration['uploader']); |
159 | 159 | |
160 | - if ($hasCustomUploader && ! is_a($uploaderConfiguration['uploader'], UploaderInterface::class, true)) { |
|
160 | + if ($hasCustomUploader && !is_a($uploaderConfiguration['uploader'], UploaderInterface::class, true)) { |
|
161 | 161 | throw new Exception('Invalid uploader class provided for '.$this->crudObjectType.' type: '.$crudObject['type']); |
162 | 162 | } |
163 | 163 | |
164 | 164 | if ($hasCustomUploader) { |
165 | - return $uploaderConfiguration['uploader']::for($crudObject, $uploaderConfiguration); |
|
165 | + return $uploaderConfiguration['uploader']::for ($crudObject, $uploaderConfiguration); |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | $uploader = app('UploadersRepository')->hasUploadFor($crudObject['type'], $this->macro); |
169 | 169 | |
170 | 170 | if ($uploader) { |
171 | - return app('UploadersRepository')->getUploadFor($crudObject['type'], $this->macro)::for($crudObject, $uploaderConfiguration); |
|
171 | + return app('UploadersRepository')->getUploadFor($crudObject['type'], $this->macro)::for ($crudObject, $uploaderConfiguration); |
|
172 | 172 | } |
173 | 173 | |
174 | 174 | throw new Exception('Undefined upload type for '.$this->crudObjectType.' type: '.$crudObject['type']); |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | |
190 | 190 | private function getSubfieldModel(array $subfield, UploaderInterface $uploader) |
191 | 191 | { |
192 | - if (! $uploader->isRelationship()) { |
|
192 | + if (!$uploader->isRelationship()) { |
|
193 | 193 | return $subfield['baseModel'] ?? get_class(app('crud')->getModel()); |
194 | 194 | } |
195 | 195 | |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | |
203 | 203 | private function getModelForRetrieveEvent(string $model, UploaderInterface $uploader) |
204 | 204 | { |
205 | - if (! $uploader->isRelationship()) { |
|
205 | + if (!$uploader->isRelationship()) { |
|
206 | 206 | return $model; |
207 | 207 | } |
208 | 208 |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | { |
18 | 18 | public bool $handleRepeatableFiles = false; |
19 | 19 | |
20 | - public null|string $repeatableContainerName = null; |
|
20 | + public null | string $repeatableContainerName = null; |
|
21 | 21 | |
22 | 22 | /******************************* |
23 | 23 | * Setters - fluently configure the uploader |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | /******************************* |
35 | 35 | * Getters |
36 | 36 | *******************************/ |
37 | - public function getRepeatableContainerName(): null|string |
|
37 | + public function getRepeatableContainerName(): null | string |
|
38 | 38 | { |
39 | 39 | return $this->repeatableContainerName; |
40 | 40 | } |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | foreach (app('UploadersRepository')->getRepeatableUploadersFor($this->getRepeatableContainerName()) as $uploader) { |
163 | 163 | $uploadedValues = $uploader->uploadRepeatableFiles($values->pluck($uploader->getAttributeName())->toArray(), $this->getPreviousRepeatableValues($entry, $uploader)); |
164 | 164 | |
165 | - $values = $values->map(function ($item, $key) use ($uploadedValues, $uploader) { |
|
165 | + $values = $values->map(function($item, $key) use ($uploadedValues, $uploader) { |
|
166 | 166 | $item[$uploader->getAttributeName()] = $uploadedValues[$key] ?? null; |
167 | 167 | |
168 | 168 | return $item; |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | |
194 | 194 | $values = $entry->{$this->getRepeatableContainerName()}; |
195 | 195 | $values = is_string($values) ? json_decode($values, true) : $values; |
196 | - $values = array_map(function ($item) use ($repeatableUploaders) { |
|
196 | + $values = array_map(function($item) use ($repeatableUploaders) { |
|
197 | 197 | foreach ($repeatableUploaders as $upload) { |
198 | 198 | $item[$upload->getAttributeName()] = $this->getValuesWithPathStripped($item, $upload); |
199 | 199 | } |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | |
209 | 209 | private function retrieveRepeatableRelationFiles(Model $entry) |
210 | 210 | { |
211 | - switch($this->getRepeatableRelationType()) { |
|
211 | + switch ($this->getRepeatableRelationType()) { |
|
212 | 212 | case 'BelongsToMany': |
213 | 213 | case 'MorphToMany': |
214 | 214 | $pivotClass = app('crud')->getModel()->{$this->getUploaderSubfield()['baseEntity']}()->getPivotClass(); |
@@ -261,12 +261,12 @@ discard block |
||
261 | 261 | $repeatableValues ??= collect($entry->{$this->getRepeatableContainerName()}); |
262 | 262 | |
263 | 263 | foreach (app('UploadersRepository')->getRepeatableUploadersFor($this->getRepeatableContainerName()) as $upload) { |
264 | - if (! $upload->shouldDeleteFiles()) { |
|
264 | + if (!$upload->shouldDeleteFiles()) { |
|
265 | 265 | continue; |
266 | 266 | } |
267 | 267 | $values = $repeatableValues->pluck($upload->getName())->toArray(); |
268 | 268 | foreach ($values as $value) { |
269 | - if (! $value) { |
|
269 | + if (!$value) { |
|
270 | 270 | continue; |
271 | 271 | } |
272 | 272 | |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | /** |
290 | 290 | * Given two multidimensional arrays/collections, merge them recursively. |
291 | 291 | */ |
292 | - protected function mergeValuesRecursive(array|Collection $array1, array|Collection $array2): array|Collection |
|
292 | + protected function mergeValuesRecursive(array | Collection $array1, array | Collection $array2): array | Collection |
|
293 | 293 | { |
294 | 294 | $merged = $array1; |
295 | 295 | foreach ($array2 as $key => &$value) { |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | { |
312 | 312 | $items = CRUD::getRequest()->input('_order_'.$this->getRepeatableContainerName()) ?? []; |
313 | 313 | |
314 | - array_walk($items, function (&$key, $value) { |
|
314 | + array_walk($items, function(&$key, $value) { |
|
315 | 315 | $requestValue = $key[$this->getName()] ?? null; |
316 | 316 | $key = $this->handleMultipleFiles ? (is_string($requestValue) ? explode(',', $requestValue) : $requestValue) : $requestValue; |
317 | 317 | }); |
@@ -323,22 +323,22 @@ discard block |
||
323 | 323 | { |
324 | 324 | $previousValues = $entry->getOriginal($uploader->getRepeatableContainerName()); |
325 | 325 | |
326 | - if (! is_array($previousValues)) { |
|
326 | + if (!is_array($previousValues)) { |
|
327 | 327 | $previousValues = json_decode($previousValues, true); |
328 | 328 | } |
329 | 329 | |
330 | - if (! empty($previousValues)) { |
|
330 | + if (!empty($previousValues)) { |
|
331 | 331 | $previousValues = array_column($previousValues, $uploader->getName()); |
332 | 332 | } |
333 | 333 | |
334 | 334 | return $previousValues ?? []; |
335 | 335 | } |
336 | 336 | |
337 | - private function getValuesWithPathStripped(array|string|null $item, UploaderInterface $uploader) |
|
337 | + private function getValuesWithPathStripped(array | string | null $item, UploaderInterface $uploader) |
|
338 | 338 | { |
339 | 339 | $uploadedValues = $item[$uploader->getName()] ?? null; |
340 | 340 | if (is_array($uploadedValues)) { |
341 | - return array_map(function ($value) use ($uploader) { |
|
341 | + return array_map(function($value) use ($uploader) { |
|
342 | 342 | return $uploader->getValueWithoutPath($value); |
343 | 343 | }, $uploadedValues); |
344 | 344 | } |
@@ -357,19 +357,19 @@ discard block |
||
357 | 357 | { |
358 | 358 | if (in_array($this->getRepeatableRelationType(), ['BelongsToMany', 'MorphToMany'])) { |
359 | 359 | $pivotAttributes = $entry->getAttributes(); |
360 | - $connectedPivot = $entry->pivotParent->{$this->getRepeatableContainerName()}->where(function ($item) use ($pivotAttributes) { |
|
360 | + $connectedPivot = $entry->pivotParent->{$this->getRepeatableContainerName()}->where(function($item) use ($pivotAttributes) { |
|
361 | 361 | $itemPivotAttributes = $item->pivot->only(array_keys($pivotAttributes)); |
362 | 362 | |
363 | 363 | return $itemPivotAttributes === $pivotAttributes; |
364 | 364 | })->first(); |
365 | 365 | |
366 | - if (! $connectedPivot) { |
|
366 | + if (!$connectedPivot) { |
|
367 | 367 | return; |
368 | 368 | } |
369 | 369 | |
370 | 370 | $files = $connectedPivot->getOriginal()['pivot_'.$this->getAttributeName()]; |
371 | 371 | |
372 | - if (! $files) { |
|
372 | + if (!$files) { |
|
373 | 373 | return; |
374 | 374 | } |
375 | 375 |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | return $this->getPath().$fileName; |
30 | 30 | } |
31 | 31 | |
32 | - if (! $value && CrudPanelFacade::getRequest()->has($this->getNameForRequest()) && $previousFile) { |
|
32 | + if (!$value && CrudPanelFacade::getRequest()->has($this->getNameForRequest()) && $previousFile) { |
|
33 | 33 | Storage::disk($this->getDisk())->delete($previousFile); |
34 | 34 | |
35 | 35 | return null; |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | foreach ($previousRepeatableValues as $row => $file) { |
57 | 57 | foreach ($previousRepeatableValues as $row => $file) { |
58 | 58 | if ($file) { |
59 | - if (! isset($orderedFiles[$row])) { |
|
59 | + if (!isset($orderedFiles[$row])) { |
|
60 | 60 | $orderedFiles[$row] = null; |
61 | 61 | } |
62 | 62 | if ($file !== $orderedFiles[$row]) { |