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; |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | } |
78 | 78 | |
79 | 79 | $subfields = collect($this->crudObject->getAttributes()['subfields']); |
80 | - $subfields = $subfields->map(function ($item) use ($subfield, $uploader) { |
|
80 | + $subfields = $subfields->map(function($item) use ($subfield, $uploader) { |
|
81 | 81 | if ($item['name'] === $subfield['name']) { |
82 | 82 | $item['upload'] = true; |
83 | 83 | $item['disk'] = $uploader->getDisk(); |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | } |
108 | 108 | |
109 | 109 | if ($this->crudObjectType === 'field') { |
110 | - $model::saving(function ($entry) use ($uploader) { |
|
110 | + $model::saving(function($entry) use ($uploader) { |
|
111 | 111 | $updatedCountKey = 'uploaded_'.($uploader->getRepeatableContainerName() ?? $uploader->getName()).'_count'; |
112 | 112 | |
113 | 113 | CRUD::set($updatedCountKey, CRUD::get($updatedCountKey) ?? 0); |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | // is not called in pivot models when eager loading the relations. |
127 | 127 | $retrieveModel = $this->getRetrieveModel($model, $uploader); |
128 | 128 | |
129 | - $retrieveModel::retrieved(function ($entry) use ($uploader) { |
|
129 | + $retrieveModel::retrieved(function($entry) use ($uploader) { |
|
130 | 130 | if ($entry->translationEnabled()) { |
131 | 131 | $locale = request('_locale', \App::getLocale()); |
132 | 132 | if (in_array($locale, array_keys($entry->getAvailableLocales()))) { |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | }); |
138 | 138 | } |
139 | 139 | |
140 | - $model::deleting(function ($entry) use ($uploader) { |
|
140 | + $model::deleting(function($entry) use ($uploader) { |
|
141 | 141 | $uploader->deleteUploadedFiles($entry); |
142 | 142 | }); |
143 | 143 | |
@@ -159,13 +159,13 @@ discard block |
||
159 | 159 | $customUploader = isset($uploaderConfiguration['uploader']) && class_exists($uploaderConfiguration['uploader']); |
160 | 160 | |
161 | 161 | if ($customUploader) { |
162 | - return $uploaderConfiguration['uploader']::for($crudObject, $uploaderConfiguration); |
|
162 | + return $uploaderConfiguration['uploader']::for ($crudObject, $uploaderConfiguration); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | $uploader = app('UploadersRepository')->hasUploadFor($crudObject['type'], $this->macro); |
166 | 166 | |
167 | 167 | if ($uploader) { |
168 | - return app('UploadersRepository')->getUploadFor($crudObject['type'], $this->macro)::for($crudObject, $uploaderConfiguration); |
|
168 | + return app('UploadersRepository')->getUploadFor($crudObject['type'], $this->macro)::for ($crudObject, $uploaderConfiguration); |
|
169 | 169 | } |
170 | 170 | |
171 | 171 | throw new Exception('Undefined upload type for '.$this->crudObjectType.' type: '.$crudObject['type']); |
@@ -181,11 +181,11 @@ discard block |
||
181 | 181 | |
182 | 182 | private function getSubfieldModel(array $subfield, UploaderInterface $uploader) |
183 | 183 | { |
184 | - if (! $uploader->isRelationship()) { |
|
184 | + if (!$uploader->isRelationship()) { |
|
185 | 185 | return $subfield['baseModel'] ?? get_class(app('crud')->getModel()); |
186 | 186 | } |
187 | 187 | |
188 | - switch($subfield['relation_type']) { |
|
188 | + switch ($subfield['relation_type']) { |
|
189 | 189 | case 'BelongsToMany': |
190 | 190 | return app('crud')->getModel()->{$subfield['baseEntity']}()->getPivotClass(); |
191 | 191 | } |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | |
194 | 194 | private function getRetrieveModel(string $model, UploaderInterface $uploader) |
195 | 195 | { |
196 | - if (! $uploader->isRelationship()) { |
|
196 | + if (!$uploader->isRelationship()) { |
|
197 | 197 | return $model; |
198 | 198 | } |
199 | 199 |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | return ['name' => $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 | |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | } |
188 | 188 | // if there's a model defined, but no attribute |
189 | 189 | // guess an attribute using the identifiableAttribute functionality in CrudTrait |
190 | - if (isset($field['model']) && ! isset($field['attribute']) && method_exists($field['model'], 'identifiableAttribute')) { |
|
190 | + if (isset($field['model']) && !isset($field['attribute']) && method_exists($field['model'], 'identifiableAttribute')) { |
|
191 | 191 | $field['attribute'] = (new $field['model']())->identifiableAttribute(); |
192 | 192 | } |
193 | 193 | |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | */ |
204 | 204 | protected function makeSureFieldHasLabel($field) |
205 | 205 | { |
206 | - if (! isset($field['label'])) { |
|
206 | + if (!isset($field['label'])) { |
|
207 | 207 | $name = str_replace(',', ' ', $field['name']); |
208 | 208 | $name = str_replace('_id', '', $name); |
209 | 209 | $field['label'] = mb_ucfirst(str_replace('_', ' ', $name)); |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | */ |
222 | 222 | protected function makeSureFieldHasType($field) |
223 | 223 | { |
224 | - if (! isset($field['type'])) { |
|
224 | + if (!isset($field['type'])) { |
|
225 | 225 | $field['type'] = isset($field['relation_type']) ? $this->inferFieldTypeFromRelationType($field['relation_type']) : $this->inferFieldTypeFromDbColumnType($field['name']); |
226 | 226 | } |
227 | 227 | |
@@ -254,12 +254,12 @@ discard block |
||
254 | 254 | */ |
255 | 255 | protected function makeSureSubfieldsHaveNecessaryAttributes($field) |
256 | 256 | { |
257 | - if (! isset($field['subfields'])) { |
|
257 | + if (!isset($field['subfields'])) { |
|
258 | 258 | return $field; |
259 | 259 | } |
260 | 260 | |
261 | 261 | foreach ($field['subfields'] as $key => $subfield) { |
262 | - if (empty($subfield) || ! isset($subfield['name'])) { |
|
262 | + if (empty($subfield) || !isset($subfield['name'])) { |
|
263 | 263 | abort(500, 'Subfield name can\'t be empty'); |
264 | 264 | } |
265 | 265 | |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | |
271 | 271 | $subfield['parentFieldName'] = $field['name']; |
272 | 272 | |
273 | - if (! isset($field['model'])) { |
|
273 | + if (!isset($field['model'])) { |
|
274 | 274 | // we're inside a simple 'repeatable' with no model/relationship, so |
275 | 275 | // we assume all subfields are supposed to be text fields |
276 | 276 | $subfield['type'] = $subfield['type'] ?? 'text'; |
@@ -297,11 +297,11 @@ discard block |
||
297 | 297 | case 'BelongsToMany': |
298 | 298 | $pivotSelectorField = static::getPivotFieldStructure($field); |
299 | 299 | |
300 | - $pivot = Arr::where($field['subfields'], function ($item) use ($pivotSelectorField) { |
|
300 | + $pivot = Arr::where($field['subfields'], function($item) use ($pivotSelectorField) { |
|
301 | 301 | return $item['name'] === $pivotSelectorField['name']; |
302 | 302 | }); |
303 | 303 | |
304 | - if (! empty($pivot)) { |
|
304 | + if (!empty($pivot)) { |
|
305 | 305 | break; |
306 | 306 | } |
307 | 307 | |
@@ -314,11 +314,11 @@ discard block |
||
314 | 314 | $entity = isset($field['baseEntity']) ? $field['baseEntity'].'.'.$field['entity'] : $field['entity']; |
315 | 315 | $relationInstance = $this->getRelationInstance(['entity' => $entity]); |
316 | 316 | |
317 | - $localKeyField = Arr::where($field['subfields'], function ($item) use ($relationInstance) { |
|
317 | + $localKeyField = Arr::where($field['subfields'], function($item) use ($relationInstance) { |
|
318 | 318 | return $item['name'] === $relationInstance->getRelated()->getKeyName(); |
319 | 319 | }); |
320 | 320 | |
321 | - if (! empty($localKeyField)) { |
|
321 | + if (!empty($localKeyField)) { |
|
322 | 322 | break; |
323 | 323 | } |
324 | 324 | |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | { |
344 | 344 | // if a tab was mentioned, we should enable it |
345 | 345 | if (isset($field['tab'])) { |
346 | - if (! $this->tabsEnabled()) { |
|
346 | + if (!$this->tabsEnabled()) { |
|
347 | 347 | $this->enableTabs(); |
348 | 348 | } |
349 | 349 | } |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | |
26 | 26 | private bool $deleteWhenEntryIsDeleted = true; |
27 | 27 | |
28 | - private bool|string $attachedToFakeField = false; |
|
28 | + private bool | string $attachedToFakeField = false; |
|
29 | 29 | |
30 | 30 | /** |
31 | 31 | * Cloud disks have the ability to generate temporary URLs to files, should we do it? |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | /******************************* |
58 | 58 | * Static methods |
59 | 59 | *******************************/ |
60 | - public static function for(array $crudObject, array $definition): UploaderInterface |
|
60 | + public static function for (array $crudObject, array $definition): UploaderInterface |
|
61 | 61 | { |
62 | 62 | return new static($crudObject, $definition); |
63 | 63 | } |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | public function deleteUploadedFiles(Model $entry): void |
99 | 99 | { |
100 | 100 | if ($this->deleteWhenEntryIsDeleted) { |
101 | - if (! in_array(SoftDeletes::class, class_uses_recursive($entry), true)) { |
|
101 | + if (!in_array(SoftDeletes::class, class_uses_recursive($entry), true)) { |
|
102 | 102 | $this->performFileDeletion($entry); |
103 | 103 | |
104 | 104 | return; |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | |
170 | 170 | public function getPreviousFiles(Model $entry): mixed |
171 | 171 | { |
172 | - if (! $this->attachedToFakeField) { |
|
172 | + if (!$this->attachedToFakeField) { |
|
173 | 173 | return $this->getOriginalValue($entry); |
174 | 174 | } |
175 | 175 | |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | $value = $entry->{$this->getAttributeName()}; |
209 | 209 | |
210 | 210 | if ($this->handleMultipleFiles) { |
211 | - if (! isset($entry->getCasts()[$this->getName()]) && is_string($value)) { |
|
211 | + if (!isset($entry->getCasts()[$this->getName()]) && is_string($value)) { |
|
212 | 212 | $entry->{$this->getAttributeName()} = json_decode($value, true); |
213 | 213 | } |
214 | 214 | |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | |
237 | 237 | if ($this->handleMultipleFiles) { |
238 | 238 | // ensure we have an array of values when field is not casted in model. |
239 | - if (! isset($entry->getCasts()[$this->name]) && is_string($values)) { |
|
239 | + if (!isset($entry->getCasts()[$this->name]) && is_string($values)) { |
|
240 | 240 | $values = json_decode($values, true); |
241 | 241 | } |
242 | 242 | foreach ($values as $value) { |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | |
253 | 253 | private function performFileDeletion(Model $entry) |
254 | 254 | { |
255 | - if (! $this->handleRepeatableFiles) { |
|
255 | + if (!$this->handleRepeatableFiles) { |
|
256 | 256 | $this->deleteFiles($entry); |
257 | 257 | |
258 | 258 | return; |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | { |
276 | 276 | $previousValue = $entry->getOriginal($field ?? $this->getAttributeName()); |
277 | 277 | |
278 | - if (! $previousValue) { |
|
278 | + if (!$previousValue) { |
|
279 | 279 | return $previousValue; |
280 | 280 | } |
281 | 281 |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | foreach (app('UploadersRepository')->getRepeatableUploadersFor($this->getRepeatableContainerName()) as $uploader) { |
77 | 77 | $uploadedValues = $uploader->uploadRepeatableFiles($values->pluck($uploader->getAttributeName())->toArray(), $this->getPreviousRepeatableValues($entry, $uploader)); |
78 | 78 | |
79 | - $values = $values->map(function ($item, $key) use ($uploadedValues, $uploader) { |
|
79 | + $values = $values->map(function($item, $key) use ($uploadedValues, $uploader) { |
|
80 | 80 | $item[$uploader->getAttributeName()] = $uploadedValues[$key] ?? null; |
81 | 81 | |
82 | 82 | return $item; |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | |
97 | 97 | $values = $entry->{$this->getRepeatableContainerName()}; |
98 | 98 | $values = is_string($values) ? json_decode($values, true) : $values; |
99 | - $values = array_map(function ($item) use ($repeatableUploaders) { |
|
99 | + $values = array_map(function($item) use ($repeatableUploaders) { |
|
100 | 100 | foreach ($repeatableUploaders as $upload) { |
101 | 101 | $item[$upload->getAttributeName()] = $this->getValuesWithPathStripped($item, $upload); |
102 | 102 | } |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | |
112 | 112 | private function retrieveRepeatableRelationFiles(Model $entry) |
113 | 113 | { |
114 | - switch($this->getRepeatableRelationType()) { |
|
114 | + switch ($this->getRepeatableRelationType()) { |
|
115 | 115 | case 'BelongsToMany': |
116 | 116 | $pivotClass = app('crud')->getModel()->{$this->getUploaderSubfield()['baseEntity']}()->getPivotClass(); |
117 | 117 | $pivotFieldName = 'pivot_'.$this->getAttributeName(); |
@@ -149,22 +149,22 @@ discard block |
||
149 | 149 | private function deleteRepeatableFiles(Model $entry): void |
150 | 150 | { |
151 | 151 | if ($this->isRelationship) { |
152 | - switch($this->getRepeatableRelationType()) { |
|
152 | + switch ($this->getRepeatableRelationType()) { |
|
153 | 153 | case 'BelongsToMany': |
154 | 154 | $pivotAttributes = $entry->getAttributes(); |
155 | - $connectedPivot = $entry->pivotParent->{$this->getRepeatableContainerName()}->where(function ($item) use ($pivotAttributes) { |
|
155 | + $connectedPivot = $entry->pivotParent->{$this->getRepeatableContainerName()}->where(function($item) use ($pivotAttributes) { |
|
156 | 156 | $itemPivotAttributes = $item->pivot->only(array_keys($pivotAttributes)); |
157 | 157 | |
158 | 158 | return $itemPivotAttributes === $pivotAttributes; |
159 | 159 | })->first(); |
160 | 160 | |
161 | - if (! $connectedPivot) { |
|
161 | + if (!$connectedPivot) { |
|
162 | 162 | return; |
163 | 163 | } |
164 | 164 | |
165 | 165 | $files = $connectedPivot->getOriginal()['pivot_'.$this->getAttributeName()]; |
166 | 166 | |
167 | - if (! $files) { |
|
167 | + if (!$files) { |
|
168 | 168 | return; |
169 | 169 | } |
170 | 170 | |
@@ -190,12 +190,12 @@ discard block |
||
190 | 190 | |
191 | 191 | $repeatableValues = collect($entry->{$this->getName()}); |
192 | 192 | foreach (app('UploadersRepository')->getRepeatableUploadersFor($this->getRepeatableContainerName()) as $upload) { |
193 | - if (! $upload->shouldDeleteFiles()) { |
|
193 | + if (!$upload->shouldDeleteFiles()) { |
|
194 | 194 | continue; |
195 | 195 | } |
196 | 196 | $values = $repeatableValues->pluck($upload->getName())->toArray(); |
197 | 197 | foreach ($values as $value) { |
198 | - if (! $value) { |
|
198 | + if (!$value) { |
|
199 | 199 | continue; |
200 | 200 | } |
201 | 201 | |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | /** |
219 | 219 | * Given two multidimensional arrays/collections, merge them recursively. |
220 | 220 | */ |
221 | - protected function mergeValuesRecursive(array|Collection $array1, array|Collection $array2): array|Collection |
|
221 | + protected function mergeValuesRecursive(array | Collection $array1, array | Collection $array2): array | Collection |
|
222 | 222 | { |
223 | 223 | $merged = $array1; |
224 | 224 | foreach ($array2 as $key => &$value) { |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | { |
241 | 241 | $items = CRUD::getRequest()->input('_order_'.$this->getRepeatableContainerName()) ?? []; |
242 | 242 | |
243 | - array_walk($items, function (&$key, $value) { |
|
243 | + array_walk($items, function(&$key, $value) { |
|
244 | 244 | $requestValue = $key[$this->getName()] ?? null; |
245 | 245 | $key = $this->handleMultipleFiles ? (is_string($requestValue) ? explode(',', $requestValue) : $requestValue) : $requestValue; |
246 | 246 | }); |
@@ -252,18 +252,18 @@ discard block |
||
252 | 252 | { |
253 | 253 | $previousValues = json_decode($entry->getOriginal($uploader->getRepeatableContainerName()), true); |
254 | 254 | |
255 | - if (! empty($previousValues)) { |
|
255 | + if (!empty($previousValues)) { |
|
256 | 256 | $previousValues = array_column($previousValues, $uploader->getName()); |
257 | 257 | } |
258 | 258 | |
259 | 259 | return $previousValues ?? []; |
260 | 260 | } |
261 | 261 | |
262 | - private function getValuesWithPathStripped(array|string|null $item, UploaderInterface $upload) |
|
262 | + private function getValuesWithPathStripped(array | string | null $item, UploaderInterface $upload) |
|
263 | 263 | { |
264 | 264 | $uploadedValues = $item[$upload->getName()] ?? null; |
265 | 265 | if (is_array($uploadedValues)) { |
266 | - return array_map(function ($value) use ($upload) { |
|
266 | + return array_map(function($value) use ($upload) { |
|
267 | 267 | return Str::after($value, $upload->getPath()); |
268 | 268 | }, $uploadedValues); |
269 | 269 | } |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | return $this->getPath().$fileName; |
24 | 24 | } |
25 | 25 | |
26 | - if (! $value && CrudPanelFacade::getRequest()->has($this->getRepeatableContainerName() ?? $this->getName()) && $previousFile) { |
|
26 | + if (!$value && CrudPanelFacade::getRequest()->has($this->getRepeatableContainerName() ?? $this->getName()) && $previousFile) { |
|
27 | 27 | Storage::disk($this->getDisk())->delete($previousFile); |
28 | 28 | |
29 | 29 | return null; |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | } |
48 | 48 | |
49 | 49 | foreach ($previousRepeatableValues as $row => $file) { |
50 | - if ($file && ! isset($orderedFiles[$row])) { |
|
50 | + if ($file && !isset($orderedFiles[$row])) { |
|
51 | 51 | $orderedFiles[$row] = null; |
52 | 52 | Storage::disk($this->getDisk())->delete($file); |
53 | 53 | } |