@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | $relationRepository = $this->getModelRepository($relation, $model); |
| 16 | 16 | |
| 17 | 17 | if (!$keepExisting) { |
| 18 | - $object->$relation()->each(function ($repeaterElement) { |
|
| 18 | + $object->$relation()->each(function($repeaterElement) { |
|
| 19 | 19 | $repeaterElement->forceDelete(); |
| 20 | 20 | }); |
| 21 | 21 | } |
@@ -112,8 +112,8 @@ discard block |
||
| 112 | 112 | |
| 113 | 113 | if (isset($relatedItemFormFields['medias'])) { |
| 114 | 114 | if (config('twill.media_library.translated_form_fields', false)) { |
| 115 | - Collection::make($relatedItemFormFields['medias'])->each(function ($rolesWithMedias, $locale) use (&$repeatersMedias, $relation, $relationItem) { |
|
| 116 | - $repeatersMedias[] = Collection::make($rolesWithMedias)->mapWithKeys(function ($medias, $role) use ($locale, $relation, $relationItem) { |
|
| 115 | + Collection::make($relatedItemFormFields['medias'])->each(function($rolesWithMedias, $locale) use (&$repeatersMedias, $relation, $relationItem) { |
|
| 116 | + $repeatersMedias[] = Collection::make($rolesWithMedias)->mapWithKeys(function($medias, $role) use ($locale, $relation, $relationItem) { |
|
| 117 | 117 | return [ |
| 118 | 118 | "blocks[$relation-$relationItem->id][$role][$locale]" => $medias, |
| 119 | 119 | ]; |
@@ -127,8 +127,8 @@ discard block |
||
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | if (isset($relatedItemFormFields['files'])) { |
| 130 | - Collection::make($relatedItemFormFields['files'])->each(function ($rolesWithFiles, $locale) use (&$repeatersFiles, $relation, $relationItem) { |
|
| 131 | - $repeatersFiles[] = Collection::make($rolesWithFiles)->mapWithKeys(function ($files, $role) use ($locale, $relation, $relationItem) { |
|
| 130 | + Collection::make($relatedItemFormFields['files'])->each(function($rolesWithFiles, $locale) use (&$repeatersFiles, $relation, $relationItem) { |
|
| 131 | + $repeatersFiles[] = Collection::make($rolesWithFiles)->mapWithKeys(function($files, $role) use ($locale, $relation, $relationItem) { |
|
| 132 | 132 | return [ |
| 133 | 133 | "blocks[$relation-$relationItem->id][$role][$locale]" => $files, |
| 134 | 134 | ]; |
@@ -23,12 +23,12 @@ discard block |
||
| 23 | 23 | |
| 24 | 24 | $submittedLanguages = Collection::make($fields['languages'] ?? []); |
| 25 | 25 | |
| 26 | - $atLeastOneLanguageIsPublished = $submittedLanguages->contains(function ($language) { |
|
| 26 | + $atLeastOneLanguageIsPublished = $submittedLanguages->contains(function($language) { |
|
| 27 | 27 | return $language['published']; |
| 28 | 28 | }); |
| 29 | 29 | |
| 30 | 30 | foreach ($locales as $index => $locale) { |
| 31 | - $submittedLanguage = Arr::first($submittedLanguages->filter(function ($lang) use ($locale) { |
|
| 31 | + $submittedLanguage = Arr::first($submittedLanguages->filter(function($lang) use ($locale) { |
|
| 32 | 32 | return $lang['value'] == $locale; |
| 33 | 33 | })); |
| 34 | 34 | |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | $fields[$locale] = [ |
| 40 | 40 | 'active' => $activeField, |
| 41 | - ] + $attributes->mapWithKeys(function ($attribute) use (&$fields, $locale, $localesCount, $index) { |
|
| 41 | + ] + $attributes->mapWithKeys(function($attribute) use (&$fields, $locale, $localesCount, $index) { |
|
| 42 | 42 | $attributeValue = $fields[$attribute] ?? null; |
| 43 | 43 | |
| 44 | 44 | // if we are at the last locale, |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | { |
| 80 | 80 | if (property_exists($this->model, 'translatedAttributes')) { |
| 81 | 81 | $attributes = $this->model->translatedAttributes; |
| 82 | - $query->whereHas('translations', function ($q) use ($scopes, $attributes) { |
|
| 82 | + $query->whereHas('translations', function($q) use ($scopes, $attributes) { |
|
| 83 | 83 | foreach ($attributes as $attribute) { |
| 84 | 84 | if (isset($scopes[$attribute]) && is_string($scopes[$attribute])) { |
| 85 | 85 | $q->where($attribute, 'like', '%' . $scopes[$attribute] . '%'); |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | $mediasCollection = Collection::make(); |
| 24 | 24 | $mediasFromFields = $this->getMedias($fields); |
| 25 | 25 | |
| 26 | - $mediasFromFields->each(function ($media) use ($object, $mediasCollection) { |
|
| 26 | + $mediasFromFields->each(function($media) use ($object, $mediasCollection) { |
|
| 27 | 27 | $newMedia = Media::withTrashed()->find(is_array($media['id']) ? Arr::first($media['id']) : $media['id']); |
| 28 | 28 | $pivot = $newMedia->newPivot($object, Arr::except($media, ['id']), 'mediables', true); |
| 29 | 29 | $newMedia->setRelation('pivot', $pivot); |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | $object->medias()->sync([]); |
| 50 | 50 | |
| 51 | - $this->getMedias($fields)->each(function ($media) use ($object) { |
|
| 51 | + $this->getMedias($fields)->each(function($media) use ($object) { |
|
| 52 | 52 | $object->medias()->attach($media['id'], Arr::except($media, ['id'])); |
| 53 | 53 | }); |
| 54 | 54 | } |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | if (in_array($role, array_keys($this->model->mediasParams ?? [])) |
| 78 | 78 | || in_array($role, array_keys(config('twill.block_editor.crops', []))) |
| 79 | 79 | || in_array($role, array_keys(config('twill.settings.crops', [])))) { |
| 80 | - Collection::make($mediasForRole)->each(function ($media) use (&$medias, $role, $locale) { |
|
| 80 | + Collection::make($mediasForRole)->each(function($media) use (&$medias, $role, $locale) { |
|
| 81 | 81 | $customMetadatas = $media['metadatas']['custom'] ?? []; |
| 82 | 82 | if (isset($media['crops']) && !empty($media['crops'])) { |
| 83 | 83 | foreach ($media['crops'] as $cropName => $cropData) { |
@@ -78,7 +78,7 @@ |
||
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | if (!$item && config('translatable.use_property_fallback', false)) { |
| 81 | - $item = (clone $query)->orWhere(function ($query) { |
|
| 81 | + $item = (clone $query)->orWhere(function($query) { |
|
| 82 | 82 | return $query->withActiveTranslations(config('translatable.fallback_locale')); |
| 83 | 83 | })->forFallbackLocaleSlug($slug)->first(); |
| 84 | 84 | |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | $filesCollection = Collection::make(); |
| 24 | 24 | $filesFromFields = $this->getFiles($fields); |
| 25 | 25 | |
| 26 | - $filesFromFields->each(function ($file) use ($object, $filesCollection) { |
|
| 26 | + $filesFromFields->each(function($file) use ($object, $filesCollection) { |
|
| 27 | 27 | $newFile = File::withTrashed()->find($file['id']); |
| 28 | 28 | $pivot = $newFile->newPivot($object, Arr::except($file, ['id']), 'fileables', true); |
| 29 | 29 | $newFile->setRelation('pivot', $pivot); |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | $object->files()->sync([]); |
| 50 | 50 | |
| 51 | - $this->getFiles($fields)->each(function ($file) use ($object) { |
|
| 51 | + $this->getFiles($fields)->each(function($file) use ($object) { |
|
| 52 | 52 | $object->files()->attach($file['id'], Arr::except($file, ['id'])); |
| 53 | 53 | }); |
| 54 | 54 | } |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | if (in_array($role, $this->model->filesParams ?? []) |
| 75 | 75 | || in_array($role, config('twill.block_editor.files', []))) { |
| 76 | 76 | |
| 77 | - Collection::make($filesForRole)->each(function ($file) use (&$files, $role, $locale) { |
|
| 77 | + Collection::make($filesForRole)->each(function($file) use (&$files, $role, $locale) { |
|
| 78 | 78 | $files->push([ |
| 79 | 79 | 'id' => $file['id'], |
| 80 | 80 | 'role' => $role, |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | if ($object->has('files')) { |
| 100 | 100 | foreach ($object->files->groupBy('pivot.role') as $role => $filesByRole) { |
| 101 | 101 | foreach ($filesByRole->groupBy('pivot.locale') as $locale => $filesByLocale) { |
| 102 | - $fields['files'][$locale][$role] = $filesByLocale->map(function ($file) { |
|
| 102 | + $fields['files'][$locale][$role] = $filesByLocale->map(function($file) { |
|
| 103 | 103 | return $file->toCmsArray(); |
| 104 | 104 | }); |
| 105 | 105 | } |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | try { |
| 34 | 34 | $blobUri = $request->input('bloburi'); |
| 35 | 35 | $method = $request->input('_method'); |
| 36 | - $permissions = '' ; |
|
| 36 | + $permissions = ''; |
|
| 37 | 37 | if (strtolower($method) === 'put') { |
| 38 | 38 | $permissions = 'w'; |
| 39 | 39 | } else if (strtolower($method) === 'delete') { |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | $now = new DateTime("now", new DateTimeZone("UTC")); |
| 49 | 49 | $expire = $now->modify('+15 min'); |
| 50 | 50 | |
| 51 | - $path = $this->config->get('filesystems.disks.' . $disk .'.container') . str_replace(azureEndpoint($disk), '', $blobUri); |
|
| 51 | + $path = $this->config->get('filesystems.disks.' . $disk . '.container') . str_replace(azureEndpoint($disk), '', $blobUri); |
|
| 52 | 52 | $sasUrl = $blobUri . '?' . $this->blobSharedAccessSignatureHelper->generateBlobServiceSharedAccessSignatureToken('b', $path, $permissions, $expire); |
| 53 | 53 | return $listener->uploadIsSigned($sasUrl, false); |
| 54 | 54 | } catch (\Exception $e) { |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | $items = $this->getIndexItems($scopes); |
| 100 | 100 | |
| 101 | 101 | return [ |
| 102 | - 'items' => $items->map(function ($item) { |
|
| 102 | + 'items' => $items->map(function($item) { |
|
| 103 | 103 | return $item->toCmsArray(); |
| 104 | 104 | })->toArray(), |
| 105 | 105 | 'maxPage' => $items->lastPage(), |
@@ -220,11 +220,11 @@ discard block |
||
| 220 | 220 | { |
| 221 | 221 | $ids = explode(',', $this->request->input('ids')); |
| 222 | 222 | |
| 223 | - $metadatasFromRequest = $this->getExtraMetadatas()->reject(function ($meta) { |
|
| 223 | + $metadatasFromRequest = $this->getExtraMetadatas()->reject(function($meta) { |
|
| 224 | 224 | return is_null($meta); |
| 225 | 225 | })->toArray(); |
| 226 | 226 | |
| 227 | - $extraMetadatas = array_diff_key($metadatasFromRequest, array_flip((array)$this->request->get('fieldsRemovedFromBulkEditing', []))); |
|
| 227 | + $extraMetadatas = array_diff_key($metadatasFromRequest, array_flip((array) $this->request->get('fieldsRemovedFromBulkEditing', []))); |
|
| 228 | 228 | |
| 229 | 229 | if (in_array('tags', $this->request->get('fieldsRemovedFromBulkEditing', []))) { |
| 230 | 230 | $this->repository->addIgnoreFieldsBeforeSave('bulk_tags'); |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | $items = $this->getIndexItems($scopes); |
| 245 | 245 | |
| 246 | 246 | return $this->responseFactory->json([ |
| 247 | - 'items' => $items->map(function ($item) { |
|
| 247 | + 'items' => $items->map(function($item) { |
|
| 248 | 248 | return $item->toCmsArray(); |
| 249 | 249 | })->toArray(), |
| 250 | 250 | 'tags' => $this->repository->getTagsList(), |
@@ -296,7 +296,7 @@ discard block |
||
| 296 | 296 | */ |
| 297 | 297 | private function getExtraMetadatas() |
| 298 | 298 | { |
| 299 | - return Collection::make($this->customFields)->mapWithKeys(function ($field) { |
|
| 299 | + return Collection::make($this->customFields)->mapWithKeys(function($field) { |
|
| 300 | 300 | $fieldInRequest = $this->request->get($field['name']); |
| 301 | 301 | |
| 302 | 302 | if (isset($field['type']) && $field['type'] === 'checkbox') { |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | $items = $this->getIndexItems($scopes); |
| 93 | 93 | |
| 94 | 94 | return [ |
| 95 | - 'items' => $items->map(function ($item) { |
|
| 95 | + 'items' => $items->map(function($item) { |
|
| 96 | 96 | return $this->buildFile($item); |
| 97 | 97 | })->toArray(), |
| 98 | 98 | 'maxPage' => $items->lastPage(), |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | private function buildFile($item) |
| 109 | 109 | { |
| 110 | 110 | return $item->toCmsArray() + [ |
| 111 | - 'tags' => $item->tags->map(function ($tag) { |
|
| 111 | + 'tags' => $item->tags->map(function($tag) { |
|
| 112 | 112 | return $tag->name; |
| 113 | 113 | }), |
| 114 | 114 | 'deleteUrl' => $item->canDeleteSafely() ? moduleRoute($this->moduleName, $this->routePrefix, 'destroy', $item->id) : null, |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | $items = $this->getIndexItems($scopes); |
| 231 | 231 | |
| 232 | 232 | return $this->responseFactory->json([ |
| 233 | - 'items' => $items->map(function ($item) { |
|
| 233 | + 'items' => $items->map(function($item) { |
|
| 234 | 234 | return $this->buildFile($item); |
| 235 | 235 | })->toArray(), |
| 236 | 236 | 'tags' => $this->repository->getTagsList(), |
@@ -51,13 +51,13 @@ |
||
| 51 | 51 | // anonymous functions are used to let configuration dictate |
| 52 | 52 | // the execution of the appropriate implementation |
| 53 | 53 | $endpointByType = [ |
| 54 | - 'local' => function () { |
|
| 54 | + 'local' => function() { |
|
| 55 | 55 | return $this->urlGenerator->route('admin.media-library.medias.store'); |
| 56 | 56 | }, |
| 57 | - 's3' => function () use ($libraryDisk) { |
|
| 57 | + 's3' => function() use ($libraryDisk) { |
|
| 58 | 58 | return s3Endpoint($libraryDisk); |
| 59 | 59 | }, |
| 60 | - 'azure' => function () use ($libraryDisk) { |
|
| 60 | + 'azure' => function() use ($libraryDisk) { |
|
| 61 | 61 | return azureEndpoint($libraryDisk); |
| 62 | 62 | }, |
| 63 | 63 | ]; |