@@ -24,11 +24,11 @@ discard block |
||
| 24 | 24 | |
| 25 | 25 | public function __construct(array $attributes = []) |
| 26 | 26 | { |
| 27 | - $this->fillable(array_merge($this->fillable, Collection::make(config('twill.media_library.extra_metadatas_fields'))->map(function ($field) { |
|
| 27 | + $this->fillable(array_merge($this->fillable, Collection::make(config('twill.media_library.extra_metadatas_fields'))->map(function($field) { |
|
| 28 | 28 | return $field['name']; |
| 29 | 29 | })->toArray())); |
| 30 | 30 | |
| 31 | - Collection::make(config('twill.media_library.translatable_metadatas_fields'))->each(function ($field) { |
|
| 31 | + Collection::make(config('twill.media_library.translatable_metadatas_fields'))->each(function($field) { |
|
| 32 | 32 | $this->casts[$field] = 'json'; |
| 33 | 33 | }); |
| 34 | 34 | |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | 'medium' => ImageService::getUrl($this->uuid, ["h" => "430"]), |
| 66 | 66 | 'width' => $this->width, |
| 67 | 67 | 'height' => $this->height, |
| 68 | - 'tags' => $this->tags->map(function ($tag) { |
|
| 68 | + 'tags' => $this->tags->map(function($tag) { |
|
| 69 | 69 | return $tag->name; |
| 70 | 70 | }), |
| 71 | 71 | 'deleteUrl' => $this->canDeleteSafely() ? moduleRoute('medias', 'media-library', 'destroy', $this->id) : null, |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | 'caption' => $this->caption, |
| 78 | 78 | 'altText' => $this->alt_text, |
| 79 | 79 | 'video' => null, |
| 80 | - ] + Collection::make(config('twill.media_library.extra_metadatas_fields'))->mapWithKeys(function ($field) { |
|
| 80 | + ] + Collection::make(config('twill.media_library.extra_metadatas_fields'))->mapWithKeys(function($field) { |
|
| 81 | 81 | return [ |
| 82 | 82 | $field['name'] => $this->{$field['name']}, |
| 83 | 83 | ]; |
@@ -12,15 +12,15 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | protected static function bootHasSlug() |
| 14 | 14 | { |
| 15 | - static::created(function ($model) { |
|
| 15 | + static::created(function($model) { |
|
| 16 | 16 | $model->setSlugs(); |
| 17 | 17 | }); |
| 18 | 18 | |
| 19 | - static::updated(function ($model) { |
|
| 19 | + static::updated(function($model) { |
|
| 20 | 20 | $model->setSlugs(); |
| 21 | 21 | }); |
| 22 | 22 | |
| 23 | - static::restored(function ($model) { |
|
| 23 | + static::restored(function($model) { |
|
| 24 | 24 | $model->setSlugs($restoring = true); |
| 25 | 25 | }); |
| 26 | 26 | } |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | |
| 46 | 46 | public function scopeForSlug($query, $slug) |
| 47 | 47 | { |
| 48 | - return $query->whereHas('slugs', function ($query) use ($slug) { |
|
| 48 | + return $query->whereHas('slugs', function($query) use ($slug) { |
|
| 49 | 49 | $query->whereSlug($slug); |
| 50 | 50 | $query->whereActive(true); |
| 51 | 51 | $query->whereLocale(app()->getLocale()); |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | |
| 55 | 55 | public function scopeForInactiveSlug($query, $slug) |
| 56 | 56 | { |
| 57 | - return $query->whereHas('slugs', function ($query) use ($slug) { |
|
| 57 | + return $query->whereHas('slugs', function($query) use ($slug) { |
|
| 58 | 58 | $query->whereSlug($slug); |
| 59 | 59 | $query->whereLocale(app()->getLocale()); |
| 60 | 60 | })->with(['slugs']); |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | public function scopeForFallbackLocaleSlug($query, $slug) |
| 64 | 64 | { |
| 65 | - return $query->whereHas('slugs', function ($query) use ($slug) { |
|
| 65 | + return $query->whereHas('slugs', function($query) use ($slug) { |
|
| 66 | 66 | $query->whereSlug($slug); |
| 67 | 67 | $query->whereActive(true); |
| 68 | 68 | $query->whereLocale(config('translatable.fallback_locale')); |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | foreach ($slugParams as $key => $value) { |
| 106 | 106 | //check variations of the slug |
| 107 | 107 | if ($key == 'slug') { |
| 108 | - $query->where(function ($query) use ($value) { |
|
| 108 | + $query->where(function($query) use ($value) { |
|
| 109 | 109 | $query->orWhere('slug', $value); |
| 110 | 110 | $query->orWhere('slug', $value . '-' . $this->getSuffixSlug()); |
| 111 | 111 | for ($i = 2; $i <= $this->nb_variation_slug; $i++) { |
@@ -174,14 +174,14 @@ discard block |
||
| 174 | 174 | |
| 175 | 175 | public function getActiveSlug($locale = null) |
| 176 | 176 | { |
| 177 | - return $this->slugs->first(function ($slug) use ($locale) { |
|
| 177 | + return $this->slugs->first(function($slug) use ($locale) { |
|
| 178 | 178 | return ($slug->locale === ($locale ?? app()->getLocale())) && $slug->active; |
| 179 | 179 | }) ?? null; |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | public function getFallbackActiveSlug() |
| 183 | 183 | { |
| 184 | - return $this->slugs->first(function ($slug) { |
|
| 184 | + return $this->slugs->first(function($slug) { |
|
| 185 | 185 | return $slug->locale === config('translatable.fallback_locale') && $slug->active; |
| 186 | 186 | }) ?? null; |
| 187 | 187 | } |
@@ -11,14 +11,14 @@ |
||
| 11 | 11 | |
| 12 | 12 | public function scopeMine($query) |
| 13 | 13 | { |
| 14 | - return $query->whereHas('revisions', function ($query) { |
|
| 14 | + return $query->whereHas('revisions', function($query) { |
|
| 15 | 15 | $query->where('user_id', auth('twill_users')->user()->id); |
| 16 | 16 | }); |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | public function revisionsArray() |
| 20 | 20 | { |
| 21 | - return $this->revisions->map(function ($revision) { |
|
| 21 | + return $this->revisions->map(function($revision) { |
|
| 22 | 22 | return [ |
| 23 | 23 | 'id' => $revision->id, |
| 24 | 24 | 'author' => $revision->user->name ?? 'Unknown', |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | private function findMedia($role, $crop = "default") |
| 35 | 35 | { |
| 36 | - $media = $this->medias->first(function ($media) use ($role, $crop) { |
|
| 36 | + $media = $this->medias->first(function($media) use ($role, $crop) { |
|
| 37 | 37 | if (config('twill.media_library.translated_form_fields', false)) { |
| 38 | 38 | $localeScope = $media->pivot->locale === app()->getLocale(); |
| 39 | 39 | } |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | }); |
| 43 | 43 | |
| 44 | 44 | if (!$media && config('twill.media_library.translated_form_fields', false)) { |
| 45 | - $media = $this->medias->first(function ($media) use ($role, $crop) { |
|
| 45 | + $media = $this->medias->first(function($media) use ($role, $crop) { |
|
| 46 | 46 | return $media->pivot->role === $role && $media->pivot->crop === $crop; |
| 47 | 47 | }); |
| 48 | 48 | } |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | public function images($role, $crop = "default", $params = []) |
| 87 | 87 | { |
| 88 | - $medias = $this->medias->filter(function ($media) use ($role, $crop) { |
|
| 88 | + $medias = $this->medias->filter(function($media) use ($role, $crop) { |
|
| 89 | 89 | return $media->pivot->role === $role && $media->pivot->crop === $crop; |
| 90 | 90 | }); |
| 91 | 91 | |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | |
| 121 | 121 | public function imagesAsArrays($role, $crop = "default", $params = []) |
| 122 | 122 | { |
| 123 | - $medias = $this->medias->filter(function ($media) use ($role, $crop) { |
|
| 123 | + $medias = $this->medias->filter(function($media) use ($role, $crop) { |
|
| 124 | 124 | return $media->pivot->role === $role && $media->pivot->crop === $crop; |
| 125 | 125 | }); |
| 126 | 126 | |
@@ -136,12 +136,12 @@ discard block |
||
| 136 | 136 | public function imageAltText($role, $media = null) |
| 137 | 137 | { |
| 138 | 138 | if (!$media) { |
| 139 | - $media = $this->medias->first(function ($media) use ($role) { |
|
| 139 | + $media = $this->medias->first(function($media) use ($role) { |
|
| 140 | 140 | if (config('twill.media_library.translated_form_fields', false)) { |
| 141 | 141 | $localeScope = $media->pivot->locale === app()->getLocale(); |
| 142 | 142 | } |
| 143 | 143 | |
| 144 | - return $media->pivot->role === $role && ($localeScope ?? true);; |
|
| 144 | + return $media->pivot->role === $role && ($localeScope ?? true); ; |
|
| 145 | 145 | }); |
| 146 | 146 | } |
| 147 | 147 | |
@@ -155,12 +155,12 @@ discard block |
||
| 155 | 155 | public function imageCaption($role, $media = null) |
| 156 | 156 | { |
| 157 | 157 | if (!$media) { |
| 158 | - $media = $this->medias->first(function ($media) use ($role) { |
|
| 158 | + $media = $this->medias->first(function($media) use ($role) { |
|
| 159 | 159 | if (config('twill.media_library.translated_form_fields', false)) { |
| 160 | 160 | $localeScope = $media->pivot->locale === app()->getLocale(); |
| 161 | 161 | } |
| 162 | 162 | |
| 163 | - return $media->pivot->role === $role && ($localeScope ?? true);; |
|
| 163 | + return $media->pivot->role === $role && ($localeScope ?? true); ; |
|
| 164 | 164 | }); |
| 165 | 165 | } |
| 166 | 166 | |
@@ -174,12 +174,12 @@ discard block |
||
| 174 | 174 | public function imageVideo($role, $media = null) |
| 175 | 175 | { |
| 176 | 176 | if (!$media) { |
| 177 | - $media = $this->medias->first(function ($media) use ($role) { |
|
| 177 | + $media = $this->medias->first(function($media) use ($role) { |
|
| 178 | 178 | if (config('twill.media_library.translated_form_fields', false)) { |
| 179 | 179 | $localeScope = $media->pivot->locale === app()->getLocale(); |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | - return $media->pivot->role === $role && ($localeScope ?? true);; |
|
| 182 | + return $media->pivot->role === $role && ($localeScope ?? true); ; |
|
| 183 | 183 | }); |
| 184 | 184 | } |
| 185 | 185 | |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | |
| 249 | 249 | public function imageObjects($role, $crop = "default") |
| 250 | 250 | { |
| 251 | - return $this->medias->filter(function ($media) use ($role, $crop) { |
|
| 251 | + return $this->medias->filter(function($media) use ($role, $crop) { |
|
| 252 | 252 | return $media->pivot->role === $role && $media->pivot->crop === $crop; |
| 253 | 253 | }); |
| 254 | 254 | } |
@@ -16,12 +16,12 @@ discard block |
||
| 16 | 16 | { |
| 17 | 17 | $locale = $locale ?? app()->getLocale(); |
| 18 | 18 | |
| 19 | - $file = $this->files->first(function ($file) use ($role, $locale) { |
|
| 19 | + $file = $this->files->first(function($file) use ($role, $locale) { |
|
| 20 | 20 | return $file->pivot->role === $role && $file->pivot->locale === $locale; |
| 21 | 21 | }); |
| 22 | 22 | |
| 23 | 23 | if (!$file && config('translatable.use_property_fallback', false)) { |
| 24 | - $file = $this->files->first(function ($file) use ($role) { |
|
| 24 | + $file = $this->files->first(function($file) use ($role) { |
|
| 25 | 25 | return $file->pivot->role === $role && $file->pivot->locale === config('translatable.fallback_locale'); |
| 26 | 26 | }); |
| 27 | 27 | } |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | { |
| 48 | 48 | $locale = $locale ?? app()->getLocale(); |
| 49 | 49 | |
| 50 | - $files = $this->files->filter(function ($file) use ($role, $locale) { |
|
| 50 | + $files = $this->files->filter(function($file) use ($role, $locale) { |
|
| 51 | 51 | return $file->pivot->role === $role && $file->pivot->locale === $locale; |
| 52 | 52 | }); |
| 53 | 53 | |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | return $this->relatedCache[$browser_name] = $this->relatedItems |
| 33 | 33 | ->where('browser_name', $browser_name) |
| 34 | - ->map(function ($item) { |
|
| 34 | + ->map(function($item) { |
|
| 35 | 35 | return $item->related; |
| 36 | 36 | }); |
| 37 | 37 | } |
@@ -46,9 +46,9 @@ discard block |
||
| 46 | 46 | |
| 47 | 47 | $position = 1; |
| 48 | 48 | |
| 49 | - Collection::make($items)->map(function ($item) { |
|
| 49 | + Collection::make($items)->map(function($item) { |
|
| 50 | 50 | return Arr::only($item, ['endpointType', 'id']); |
| 51 | - })->each(function ($values) use ($browser_name, &$position) { |
|
| 51 | + })->each(function($values) use ($browser_name, &$position) { |
|
| 52 | 52 | RelatedItem::create([ |
| 53 | 53 | 'subject_id' => $this->getKey(), |
| 54 | 54 | 'subject_type' => $this->getMorphClass(), |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | if (method_exists($query->getModel(), 'translations')) { |
| 19 | 19 | $locale = $locale == null ? app()->getLocale() : $locale; |
| 20 | 20 | |
| 21 | - $query->whereHas('translations', function ($query) use ($locale) { |
|
| 21 | + $query->whereHas('translations', function($query) use ($locale) { |
|
| 22 | 22 | $query->whereActive(true); |
| 23 | 23 | $query->whereLocale($locale); |
| 24 | 24 | |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | } |
| 28 | 28 | }); |
| 29 | 29 | |
| 30 | - return $query->with(['translations' => function ($query) use ($locale) { |
|
| 30 | + return $query->with(['translations' => function($query) use ($locale) { |
|
| 31 | 31 | $query->whereActive(true); |
| 32 | 32 | $query->whereLocale($locale); |
| 33 | 33 | |
@@ -85,14 +85,14 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | public function getActiveLanguages() |
| 87 | 87 | { |
| 88 | - return $this->translations->map(function ($translation) { |
|
| 88 | + return $this->translations->map(function($translation) { |
|
| 89 | 89 | return [ |
| 90 | 90 | 'shortlabel' => strtoupper($translation->locale), |
| 91 | 91 | 'label' => getLanguageLabelFromLocaleCode($translation->locale), |
| 92 | 92 | 'value' => $translation->locale, |
| 93 | 93 | 'published' => $translation->active ?? false, |
| 94 | 94 | ]; |
| 95 | - })->sortBy(function ($translation) { |
|
| 95 | + })->sortBy(function($translation) { |
|
| 96 | 96 | $localesOrdered = config('translatable.locales'); |
| 97 | 97 | return array_search($translation['value'], $localesOrdered); |
| 98 | 98 | })->values(); |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | |
| 101 | 101 | public function translatedAttribute($key) |
| 102 | 102 | { |
| 103 | - return $this->translations->mapWithKeys(function ($translation) use ($key) { |
|
| 103 | + return $this->translations->mapWithKeys(function($translation) use ($key) { |
|
| 104 | 104 | return [$translation->locale => $this->translate($translation->locale)->$key]; |
| 105 | 105 | }); |
| 106 | 106 | } |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | |
| 22 | 22 | public function scopeForBucket($query, $bucketKey) |
| 23 | 23 | { |
| 24 | - return $query->where('bucket_key', $bucketKey)->get()->map(function ($feature) { |
|
| 24 | + return $query->where('bucket_key', $bucketKey)->get()->map(function($feature) { |
|
| 25 | 25 | return $feature->featured; |
| 26 | 26 | })->filter(); |
| 27 | 27 | } |
@@ -109,13 +109,13 @@ discard block |
||
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | if (config('twill.enabled.media-library')) { |
| 112 | - $this->app->singleton('imageService', function () { |
|
| 112 | + $this->app->singleton('imageService', function() { |
|
| 113 | 113 | return $this->app->make(config('twill.media_library.image_service')); |
| 114 | 114 | }); |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | if (config('twill.enabled.file-library')) { |
| 118 | - $this->app->singleton('fileService', function () { |
|
| 118 | + $this->app->singleton('fileService', function() { |
|
| 119 | 119 | return $this->app->make(config('twill.file_library.file_service')); |
| 120 | 120 | }); |
| 121 | 121 | } |
@@ -343,20 +343,20 @@ discard block |
||
| 343 | 343 | { |
| 344 | 344 | $blade = $this->app['view']->getEngineResolver()->resolve('blade')->getCompiler(); |
| 345 | 345 | |
| 346 | - $blade->directive('dd', function ($param) { |
|
| 346 | + $blade->directive('dd', function($param) { |
|
| 347 | 347 | return "<?php dd({$param}); ?>"; |
| 348 | 348 | }); |
| 349 | 349 | |
| 350 | - $blade->directive('dumpData', function ($data) { |
|
| 350 | + $blade->directive('dumpData', function($data) { |
|
| 351 | 351 | return sprintf("<?php (new Symfony\Component\VarDumper\VarDumper)->dump(%s); exit; ?>", |
| 352 | 352 | null != $data ? $data : "get_defined_vars()"); |
| 353 | 353 | }); |
| 354 | 354 | |
| 355 | - $blade->directive('formField', function ($expression) use ($blade) { |
|
| 355 | + $blade->directive('formField', function($expression) use ($blade) { |
|
| 356 | 356 | return $this->includeView('partials.form._', $expression); |
| 357 | 357 | }); |
| 358 | 358 | |
| 359 | - $blade->directive('partialView', function ($expression) use ($blade) { |
|
| 359 | + $blade->directive('partialView', function($expression) use ($blade) { |
|
| 360 | 360 | |
| 361 | 361 | $expressionAsArray = str_getcsv($expression, ',', '\''); |
| 362 | 362 | |
@@ -392,13 +392,13 @@ discard block |
||
| 392 | 392 | ?>"; |
| 393 | 393 | }); |
| 394 | 394 | |
| 395 | - $blade->directive('pushonce', function ($expression) { |
|
| 395 | + $blade->directive('pushonce', function($expression) { |
|
| 396 | 396 | list($pushName, $pushSub) = explode(':', trim(substr($expression, 1, -1))); |
| 397 | 397 | $key = '__pushonce_' . $pushName . '_' . str_replace('-', '_', $pushSub); |
| 398 | 398 | return "<?php if(! isset(\$__env->{$key})): \$__env->{$key} = 1; \$__env->startPush('{$pushName}'); ?>"; |
| 399 | 399 | }); |
| 400 | 400 | |
| 401 | - $blade->directive('endpushonce', function () { |
|
| 401 | + $blade->directive('endpushonce', function() { |
|
| 402 | 402 | return '<?php $__env->stopPush(); endif; ?>'; |
| 403 | 403 | }); |
| 404 | 404 | } |
@@ -424,7 +424,7 @@ discard block |
||
| 424 | 424 | |
| 425 | 425 | View::composer('twill::partials.navigation.*', ActiveNavigation::class); |
| 426 | 426 | |
| 427 | - View::composer(['admin.*', 'templates.*', 'twill::*'], function ($view) { |
|
| 427 | + View::composer(['admin.*', 'templates.*', 'twill::*'], function($view) { |
|
| 428 | 428 | $with = array_merge([ |
| 429 | 429 | 'renderForBlocks' => false, |
| 430 | 430 | 'renderForModal' => false, |