We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | { |
14 | 14 | public bool $handleRepeatableFiles = false; |
15 | 15 | |
16 | - public null|string $repeatableContainerName = null; |
|
16 | + public null | string $repeatableContainerName = null; |
|
17 | 17 | |
18 | 18 | /******************************* |
19 | 19 | * Setters - fluently configure the uploader |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | /******************************* |
31 | 31 | * Getters |
32 | 32 | *******************************/ |
33 | - public function getRepeatableContainerName(): null|string |
|
33 | + public function getRepeatableContainerName(): null | string |
|
34 | 34 | { |
35 | 35 | return $this->repeatableContainerName; |
36 | 36 | } |
@@ -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 | case 'MorphToMany': |
117 | 117 | $pivotClass = app('crud')->getModel()->{$this->getUploaderSubfield()['baseEntity']}()->getPivotClass(); |
@@ -157,12 +157,12 @@ discard block |
||
157 | 157 | |
158 | 158 | $repeatableValues = collect($entry->{$this->getName()}); |
159 | 159 | foreach (app('UploadersRepository')->getRepeatableUploadersFor($this->getRepeatableContainerName()) as $upload) { |
160 | - if (! $upload->shouldDeleteFiles()) { |
|
160 | + if (!$upload->shouldDeleteFiles()) { |
|
161 | 161 | continue; |
162 | 162 | } |
163 | 163 | $values = $repeatableValues->pluck($upload->getName())->toArray(); |
164 | 164 | foreach ($values as $value) { |
165 | - if (! $value) { |
|
165 | + if (!$value) { |
|
166 | 166 | continue; |
167 | 167 | } |
168 | 168 | |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | /** |
186 | 186 | * Given two multidimensional arrays/collections, merge them recursively. |
187 | 187 | */ |
188 | - protected function mergeValuesRecursive(array|Collection $array1, array|Collection $array2): array|Collection |
|
188 | + protected function mergeValuesRecursive(array | Collection $array1, array | Collection $array2): array | Collection |
|
189 | 189 | { |
190 | 190 | $merged = $array1; |
191 | 191 | foreach ($array2 as $key => &$value) { |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | { |
208 | 208 | $items = CRUD::getRequest()->input('_order_'.$this->getRepeatableContainerName()) ?? []; |
209 | 209 | |
210 | - array_walk($items, function (&$key, $value) { |
|
210 | + array_walk($items, function(&$key, $value) { |
|
211 | 211 | $requestValue = $key[$this->getName()] ?? null; |
212 | 212 | $key = $this->handleMultipleFiles ? (is_string($requestValue) ? explode(',', $requestValue) : $requestValue) : $requestValue; |
213 | 213 | }); |
@@ -219,18 +219,18 @@ discard block |
||
219 | 219 | { |
220 | 220 | $previousValues = json_decode($entry->getOriginal($uploader->getRepeatableContainerName()), true); |
221 | 221 | |
222 | - if (! empty($previousValues)) { |
|
222 | + if (!empty($previousValues)) { |
|
223 | 223 | $previousValues = array_column($previousValues, $uploader->getName()); |
224 | 224 | } |
225 | 225 | |
226 | 226 | return $previousValues ?? []; |
227 | 227 | } |
228 | 228 | |
229 | - private function getValuesWithPathStripped(array|string|null $item, UploaderInterface $upload) |
|
229 | + private function getValuesWithPathStripped(array | string | null $item, UploaderInterface $upload) |
|
230 | 230 | { |
231 | 231 | $uploadedValues = $item[$upload->getName()] ?? null; |
232 | 232 | if (is_array($uploadedValues)) { |
233 | - return array_map(function ($value) use ($upload) { |
|
233 | + return array_map(function($value) use ($upload) { |
|
234 | 234 | return Str::after($value, $upload->getPath()); |
235 | 235 | }, $uploadedValues); |
236 | 236 | } |
@@ -242,19 +242,19 @@ discard block |
||
242 | 242 | { |
243 | 243 | if (in_array($this->getRepeatableRelationType(), ['BelongsToMany', 'MorphToMany'])) { |
244 | 244 | $pivotAttributes = $entry->getAttributes(); |
245 | - $connectedPivot = $entry->pivotParent->{$this->getRepeatableContainerName()}->where(function ($item) use ($pivotAttributes) { |
|
245 | + $connectedPivot = $entry->pivotParent->{$this->getRepeatableContainerName()}->where(function($item) use ($pivotAttributes) { |
|
246 | 246 | $itemPivotAttributes = $item->pivot->only(array_keys($pivotAttributes)); |
247 | 247 | |
248 | 248 | return $itemPivotAttributes === $pivotAttributes; |
249 | 249 | })->first(); |
250 | 250 | |
251 | - if (! $connectedPivot) { |
|
251 | + if (!$connectedPivot) { |
|
252 | 252 | return; |
253 | 253 | } |
254 | 254 | |
255 | 255 | $files = $connectedPivot->getOriginal()['pivot_'.$this->getAttributeName()]; |
256 | 256 | |
257 | - if (! $files) { |
|
257 | + if (!$files) { |
|
258 | 258 | return; |
259 | 259 | } |
260 | 260 |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | return $this->getPath().$fileName; |
24 | 24 | } |
25 | 25 | |
26 | - if (! $value && CrudPanelFacade::getRequest()->has($this->getNameForRequest()) && $previousFile) { |
|
26 | + if (!$value && CrudPanelFacade::getRequest()->has($this->getNameForRequest()) && $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 | } |
@@ -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; |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | } |
82 | 82 | |
83 | 83 | $subfields = collect($this->crudObject->getAttributes()['subfields']); |
84 | - $subfields = $subfields->map(function ($item) use ($subfield, $uploader) { |
|
84 | + $subfields = $subfields->map(function($item) use ($subfield, $uploader) { |
|
85 | 85 | if ($item['name'] === $subfield['name']) { |
86 | 86 | $item['upload'] = true; |
87 | 87 | $item['disk'] = $uploader->getDisk(); |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | } |
112 | 112 | |
113 | 113 | if ($this->crudObjectType === 'field') { |
114 | - $model::saving(function ($entry) use ($uploader) { |
|
114 | + $model::saving(function($entry) use ($uploader) { |
|
115 | 115 | $entry = $uploader->storeUploadedFiles($entry); |
116 | 116 | }); |
117 | 117 | } |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | // is not called in pivot models when loading the relations. |
125 | 125 | $retrieveModel = $this->getModelForRetrieveEvent($model, $uploader); |
126 | 126 | |
127 | - $retrieveModel::retrieved(function ($entry) use ($uploader) { |
|
127 | + $retrieveModel::retrieved(function($entry) use ($uploader) { |
|
128 | 128 | if ($entry->translationEnabled()) { |
129 | 129 | $locale = request('_locale', app()->getLocale()); |
130 | 130 | if (in_array($locale, array_keys($entry->getAvailableLocales()))) { |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | }); |
136 | 136 | } |
137 | 137 | |
138 | - $model::deleting(function ($entry) use ($uploader) { |
|
138 | + $model::deleting(function($entry) use ($uploader) { |
|
139 | 139 | $uploader->deleteUploadedFiles($entry); |
140 | 140 | }); |
141 | 141 | |
@@ -157,13 +157,13 @@ discard block |
||
157 | 157 | $customUploader = isset($uploaderConfiguration['uploader']) && class_exists($uploaderConfiguration['uploader']); |
158 | 158 | |
159 | 159 | if ($customUploader) { |
160 | - return $uploaderConfiguration['uploader']::for($crudObject, $uploaderConfiguration); |
|
160 | + return $uploaderConfiguration['uploader']::for ($crudObject, $uploaderConfiguration); |
|
161 | 161 | } |
162 | 162 | |
163 | 163 | $uploader = app('UploadersRepository')->hasUploadFor($crudObject['type'], $this->macro); |
164 | 164 | |
165 | 165 | if ($uploader) { |
166 | - return app('UploadersRepository')->getUploadFor($crudObject['type'], $this->macro)::for($crudObject, $uploaderConfiguration); |
|
166 | + return app('UploadersRepository')->getUploadFor($crudObject['type'], $this->macro)::for ($crudObject, $uploaderConfiguration); |
|
167 | 167 | } |
168 | 168 | |
169 | 169 | throw new Exception('Undefined upload type for '.$this->crudObjectType.' type: '.$crudObject['type']); |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | |
180 | 180 | private function getSubfieldModel(array $subfield, UploaderInterface $uploader) |
181 | 181 | { |
182 | - if (! $uploader->isRelationship()) { |
|
182 | + if (!$uploader->isRelationship()) { |
|
183 | 183 | return $subfield['baseModel'] ?? get_class(app('crud')->getModel()); |
184 | 184 | } |
185 | 185 | |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | |
193 | 193 | private function getModelForRetrieveEvent(string $model, UploaderInterface $uploader) |
194 | 194 | { |
195 | - if (! $uploader->isRelationship()) { |
|
195 | + if (!$uploader->isRelationship()) { |
|
196 | 196 | return $model; |
197 | 197 | } |
198 | 198 |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | $value = $value ?? CRUD::getRequest()->get($this->getName()); |
15 | 15 | $previousImage = $this->getPreviousFiles($entry); |
16 | 16 | |
17 | - if (! $value && $previousImage) { |
|
17 | + if (!$value && $previousImage) { |
|
18 | 18 | Storage::disk($this->getDisk())->delete($previousImage); |
19 | 19 | |
20 | 20 | return null; |
@@ -67,6 +67,6 @@ discard block |
||
67 | 67 | |
68 | 68 | protected function shouldKeepPreviousValueUnchanged(Model $entry, $entryValue): bool |
69 | 69 | { |
70 | - return $entry->exists && is_string($entryValue) && ! Str::startsWith($entryValue, 'data:image'); |
|
70 | + return $entry->exists && is_string($entryValue) && !Str::startsWith($entryValue, 'data:image'); |
|
71 | 71 | } |
72 | 72 | } |
@@ -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 |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | protected string $packageName = 'theme-name'; |
15 | 15 | protected array $commands = []; |
16 | 16 | protected bool $theme = true; |
17 | - protected null|string $componentsNamespace = null; |
|
17 | + protected null | string $componentsNamespace = null; |
|
18 | 18 | |
19 | 19 | /** |
20 | 20 | * ------------------------- |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | } |
146 | 146 | |
147 | 147 | // Registering package commands. |
148 | - if (! empty($this->commands)) { |
|
148 | + if (!empty($this->commands)) { |
|
149 | 149 | $this->commands($this->commands); |
150 | 150 | } |
151 | 151 | } |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | protected function packageDirectoryExistsAndIsNotEmpty($name) |
241 | 241 | { |
242 | 242 | // check if directory exists |
243 | - if (! is_dir($this->getPath().'/'.$name)) { |
|
243 | + if (!is_dir($this->getPath().'/'.$name)) { |
|
244 | 244 | return false; |
245 | 245 | } |
246 | 246 | |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | public function registerPackageBladeComponents() |
266 | 266 | { |
267 | 267 | if ($this->componentsNamespace) { |
268 | - $this->app->afterResolving(BladeCompiler::class, function () { |
|
268 | + $this->app->afterResolving(BladeCompiler::class, function() { |
|
269 | 269 | Blade::componentNamespace($this->componentsNamespace, $this->packageName); |
270 | 270 | }); |
271 | 271 | } |
@@ -22,7 +22,7 @@ |
||
22 | 22 | |
23 | 23 | public function getNotnull() |
24 | 24 | { |
25 | - return ! $this->column['nullable']; |
|
25 | + return !$this->column['nullable']; |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | public function getDefault() |
@@ -14,8 +14,8 @@ discard block |
||
14 | 14 | { |
15 | 15 | $this->getDbColumnTypes(); |
16 | 16 | |
17 | - array_map(function ($field) use ($setFields, $setColumns) { |
|
18 | - if ($setFields && ! isset($this->getCleanStateFields()[$field])) { |
|
17 | + array_map(function($field) use ($setFields, $setColumns) { |
|
18 | + if ($setFields && !isset($this->getCleanStateFields()[$field])) { |
|
19 | 19 | $this->addField([ |
20 | 20 | 'name' => $field, |
21 | 21 | 'label' => $this->makeLabel($field), |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | ]); |
29 | 29 | } |
30 | 30 | |
31 | - if ($setColumns && ! in_array($field, $this->model->getHidden()) && ! isset($this->columns()[$field])) { |
|
31 | + if ($setColumns && !in_array($field, $this->model->getHidden()) && !isset($this->columns()[$field])) { |
|
32 | 32 | $this->addColumn([ |
33 | 33 | 'name' => $field, |
34 | 34 | 'label' => $this->makeLabel($field), |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | { |
51 | 51 | $dbColumnTypes = []; |
52 | 52 | |
53 | - if (! $this->driverIsSql()) { |
|
53 | + if (!$this->driverIsSql()) { |
|
54 | 54 | return $dbColumnTypes; |
55 | 55 | } |
56 | 56 | $dbColumns = $this->getDbTableColumns(); |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | |
116 | 116 | $dbColumnTypes = $this->getDbColumnTypes(); |
117 | 117 | |
118 | - if (! isset($dbColumnTypes[$fieldName])) { |
|
118 | + if (!isset($dbColumnTypes[$fieldName])) { |
|
119 | 119 | return 'text'; |
120 | 120 | } |
121 | 121 | |
@@ -210,12 +210,12 @@ discard block |
||
210 | 210 | { |
211 | 211 | $fillable = $this->model->getFillable(); |
212 | 212 | |
213 | - if (! $this->driverIsSql()) { |
|
213 | + if (!$this->driverIsSql()) { |
|
214 | 214 | $columns = $fillable; |
215 | 215 | } else { |
216 | 216 | // Automatically-set columns should be both in the database, and in the $fillable variable on the Eloquent Model |
217 | 217 | $columns = $this->model::getDbTableSchema()->getColumnsNames(); |
218 | - if (! empty($fillable)) { |
|
218 | + if (!empty($fillable)) { |
|
219 | 219 | $columns = array_intersect($columns, $fillable); |
220 | 220 | } |
221 | 221 | } |
@@ -848,7 +848,7 @@ |
||
848 | 848 | |
849 | 849 | public function testSetDoctrineTypesMapping() |
850 | 850 | { |
851 | - if (! method_exists($this->crudPanel->getModel()->getConnection(), 'getDoctrineConnection')) { |
|
851 | + if (!method_exists($this->crudPanel->getModel()->getConnection(), 'getDoctrineConnection')) { |
|
852 | 852 | $this->markTestSkipped('This test is only for Laravel 10, Laravel 11 does not have dbal as a dependency anymore'); |
853 | 853 | } |
854 | 854 |