@@ -16,23 +16,23 @@ |
||
16 | 16 | */ |
17 | 17 | public function boot() |
18 | 18 | { |
19 | - Validator::extend('absolute_or_relative_url', function ($attribute, $value, $parameters, $validator) { |
|
19 | + Validator::extend('absolute_or_relative_url', function($attribute, $value, $parameters, $validator) { |
|
20 | 20 | return Str::startsWith($value, '/') || Validator::make([$attribute => $value], [$attribute => 'url'])->passes(); |
21 | 21 | }, 'The :attribute should be a valid url (absolute or relative)'); |
22 | 22 | |
23 | - Validator::extend('relative_or_secure_url', function ($attribute, $value, $parameters) { |
|
23 | + Validator::extend('relative_or_secure_url', function($attribute, $value, $parameters) { |
|
24 | 24 | return Str::startsWith($value, '/') || filter_var($value, FILTER_VALIDATE_URL) !== false && Str::startsWith($value, 'https'); |
25 | 25 | }, 'The :attribute should be a valid url (relative or https)'); |
26 | 26 | |
27 | - Validator::extend('web_color', function ($attribute, $value, $parameters, $validator) { |
|
27 | + Validator::extend('web_color', function($attribute, $value, $parameters, $validator) { |
|
28 | 28 | return preg_match('/^([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/i', $value); |
29 | 29 | }); |
30 | 30 | |
31 | - Validator::extend('phone_number', function ($attribute, $value, $parameters) { |
|
31 | + Validator::extend('phone_number', function($attribute, $value, $parameters) { |
|
32 | 32 | return preg_match("/^[+]?[0-9\-\ ]*$/", $value); |
33 | 33 | }); |
34 | 34 | |
35 | - Validator::extend('validBlocks', function ($attribute, $value, $parameters, $validator) { |
|
35 | + Validator::extend('validBlocks', function($attribute, $value, $parameters, $validator) { |
|
36 | 36 | $blockMessages = []; |
37 | 37 | |
38 | 38 | foreach ($value as $block) { |
@@ -65,14 +65,14 @@ discard block |
||
65 | 65 | { |
66 | 66 | return collect( |
67 | 67 | config('twill.block_editor.directories.source.icons') |
68 | - )->reduce(function (Collection $keep, $path) { |
|
68 | + )->reduce(function(Collection $keep, $path) { |
|
69 | 69 | if (!$this->files->exists($path)) { |
70 | 70 | $this->displayError("Directory not found: {$path}"); |
71 | 71 | |
72 | 72 | return $keep; |
73 | 73 | } |
74 | 74 | |
75 | - $files = collect($this->files->files($path))->map(function ( |
|
75 | + $files = collect($this->files->files($path))->map(function( |
|
76 | 76 | SplFileInfo $file |
77 | 77 | ) { |
78 | 78 | return [ |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | */ |
93 | 93 | public function handle() |
94 | 94 | { |
95 | - $icons = $this->getIconList()->filter(function ($icon) { |
|
95 | + $icons = $this->getIconList()->filter(function($icon) { |
|
96 | 96 | return $this->isAllowed($icon); |
97 | 97 | }); |
98 | 98 |
@@ -51,10 +51,10 @@ discard block |
||
51 | 51 | |
52 | 52 | $this->getChildrenPreview($block['blocks'], $blocksCollection, $newBlock->id, $blockId, $blockRepository); |
53 | 53 | |
54 | - $renderedBlocks = $blocksCollection->where('parent_id', null)->map(function ($block) use ($blocksCollection, $viewFactory, $config) { |
|
54 | + $renderedBlocks = $blocksCollection->where('parent_id', null)->map(function($block) use ($blocksCollection, $viewFactory, $config) { |
|
55 | 55 | if ($config->get('twill.block_editor.block_preview_render_childs') ?? true) { |
56 | 56 | $childBlocks = $blocksCollection->where('parent_id', $block->id); |
57 | - $renderedChildViews = $childBlocks->map(function ($childBlock) use ($viewFactory, $config) { |
|
57 | + $renderedChildViews = $childBlocks->map(function($childBlock) use ($viewFactory, $config) { |
|
58 | 58 | $view = $this->getBlockView($childBlock->type, $config); |
59 | 59 | |
60 | 60 | return $viewFactory->exists($view) ? $viewFactory->make($view, [ |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | |
109 | 109 | protected function getChildrenPreview($blocks, $blocksCollection, $parentId, &$blockId, $blockRepository) |
110 | 110 | { |
111 | - $blocks->each(function ($childBlock) use (&$blockId, $parentId, $blocksCollection, $blockRepository) { |
|
111 | + $blocks->each(function($childBlock) use (&$blockId, $parentId, $blocksCollection, $blockRepository) { |
|
112 | 112 | $childBlock['parent_id'] = $parentId; |
113 | 113 | $blockId++; |
114 | 114 | $newChildBlock = $blockRepository->createForPreview($childBlock); |
@@ -25,7 +25,7 @@ |
||
25 | 25 | return DB::table(config('twill.fileables_table', 'twill_fileables'))->where('file_id', $this->id)->count() === 0; |
26 | 26 | } |
27 | 27 | |
28 | - public function scopeUnused ($query) |
|
28 | + public function scopeUnused($query) |
|
29 | 29 | { |
30 | 30 | $usedIds = DB::table(config('twill.fileables_table'))->get()->pluck('file_id'); |
31 | 31 | return $query->whereNotIn('id', $usedIds->toArray())->get(); |
@@ -20,12 +20,12 @@ discard block |
||
20 | 20 | { |
21 | 21 | $icons = collect( |
22 | 22 | config('twill.block_editor.directories.source.icons') |
23 | - )->reduce(function (Collection $keep, $path) { |
|
23 | + )->reduce(function(Collection $keep, $path) { |
|
24 | 24 | if (!$this->files->exists($path)) { |
25 | 25 | return $keep; |
26 | 26 | } |
27 | 27 | |
28 | - $files = collect($this->files->files($path))->map(function ( |
|
28 | + $files = collect($this->files->files($path))->map(function( |
|
29 | 29 | SplFileInfo $file |
30 | 30 | ) { |
31 | 31 | if (in_array($file->getFilename(), config('twill.internal_icons'))) { |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | abort(404); |
55 | 55 | } |
56 | 56 | |
57 | - return response()->stream(function () use ($file) { |
|
57 | + return response()->stream(function() use ($file) { |
|
58 | 58 | echo $this->files->get($file); |
59 | 59 | }, 200, ["Content-Type" => "image/svg+xml"]); |
60 | 60 |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | { |
48 | 48 | $this->blockCollection |
49 | 49 | ->getMissingDirectories() |
50 | - ->each(function ($directory) { |
|
50 | + ->each(function($directory) { |
|
51 | 51 | $this->error("Directory not found: {$directory}"); |
52 | 52 | }); |
53 | 53 | } |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | return $blockCollection |
62 | 62 | ->first() |
63 | 63 | ->keys() |
64 | - ->map(function ($key) { |
|
64 | + ->map(function($key) { |
|
65 | 65 | return Str::studly($key); |
66 | 66 | }) |
67 | 67 | ->toArray(); |
@@ -81,20 +81,20 @@ discard block |
||
81 | 81 | |
82 | 82 | return $this->blockCollection |
83 | 83 | ->collect() |
84 | - ->reject(function (Block $block) use ($sourceFiltered) { |
|
84 | + ->reject(function(Block $block) use ($sourceFiltered) { |
|
85 | 85 | return $sourceFiltered && !$this->option($block->source); |
86 | 86 | }) |
87 | - ->reject(function (Block $block) use ($typeFiltered) { |
|
87 | + ->reject(function(Block $block) use ($typeFiltered) { |
|
88 | 88 | return $this->dontPassTextFilter($block) || |
89 | 89 | ($typeFiltered && |
90 | 90 | !$this->option(Str::plural($block->type))); |
91 | 91 | }) |
92 | - ->map(function (Block $block) { |
|
92 | + ->map(function(Block $block) { |
|
93 | 93 | return $this->colorize( |
94 | 94 | $this->option('short') ? $block->toShortList() : $block->toList() |
95 | 95 | ); |
96 | 96 | }) |
97 | - ->sortBy(function ($block) { |
|
97 | + ->sortBy(function($block) { |
|
98 | 98 | return [$block['group'], $block['title']]; |
99 | 99 | }); |
100 | 100 | } |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | if (filled($filter = $this->argument('filter'))) { |
153 | 153 | return !$block |
154 | 154 | ->toList() |
155 | - ->reduce(function ($keep, $element) use ($filter) { |
|
155 | + ->reduce(function($keep, $element) use ($filter) { |
|
156 | 156 | return $keep || |
157 | 157 | Str::contains( |
158 | 158 | Str::lower($element), |
@@ -353,7 +353,7 @@ discard block |
||
353 | 353 | |
354 | 354 | return collect( |
355 | 355 | config('twill.block_editor.directories.source.icons') |
356 | - )->reduce(function ($keep, $path) use ($icon) { |
|
356 | + )->reduce(function($keep, $path) use ($icon) { |
|
357 | 357 | if ($keep) { |
358 | 358 | return $keep; |
359 | 359 | } |
@@ -362,7 +362,7 @@ discard block |
||
362 | 362 | return null; |
363 | 363 | } |
364 | 364 | |
365 | - return collect($this->files->files($path))->reduce(function ($keep, SplFileInfo $file) use ($icon) { |
|
365 | + return collect($this->files->files($path))->reduce(function($keep, SplFileInfo $file) use ($icon) { |
|
366 | 366 | if ($keep) { |
367 | 367 | return $keep; |
368 | 368 | } |
@@ -46,8 +46,8 @@ discard block |
||
46 | 46 | if (Schema::hasTable(config('twill.related_table', 'twill_related'))) { |
47 | 47 | $relatedItems = Collection::make(); |
48 | 48 | |
49 | - Collection::make($fields['browsers'])->each(function ($items, $browserName) use (&$relatedItems) { |
|
50 | - Collection::make($items)->each(function ($item) use ($browserName, &$relatedItems) { |
|
49 | + Collection::make($fields['browsers'])->each(function($items, $browserName) use (&$relatedItems) { |
|
50 | + Collection::make($items)->each(function($item) use ($browserName, &$relatedItems) { |
|
51 | 51 | try { |
52 | 52 | $repository = $this->getModelRepository($item['endpointType'] ?? $browserName); |
53 | 53 | $relatedItems->push((object) [ |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | { |
76 | 76 | if (Schema::hasTable(config('twill.related_table', 'twill_related'))) { |
77 | 77 | if (isset($fields['browsers'])) { |
78 | - Collection::make($fields['browsers'])->each(function ($items, $browserName) use ($object) { |
|
78 | + Collection::make($fields['browsers'])->each(function($items, $browserName) use ($object) { |
|
79 | 79 | $object->saveRelated($items, $browserName); |
80 | 80 | }); |
81 | 81 | } |
@@ -107,14 +107,14 @@ discard block |
||
107 | 107 | $blocksList = app(BlockCollection::class)->getBlockList(); |
108 | 108 | } |
109 | 109 | |
110 | - $block['type'] = $blocksList->keyBy('name')->search(function ($blockConfig) use ($block) { |
|
110 | + $block['type'] = $blocksList->keyBy('name')->search(function($blockConfig) use ($block) { |
|
111 | 111 | return $blockConfig['component'] === $block['type']; |
112 | 112 | }); |
113 | 113 | |
114 | 114 | $block['content'] = empty($block['content']) ? new \stdClass : (object) $block['content']; |
115 | 115 | |
116 | 116 | if ($block['browsers']) { |
117 | - $browsers = Collection::make($block['browsers'])->map(function ($items) { |
|
117 | + $browsers = Collection::make($block['browsers'])->map(function($items) { |
|
118 | 118 | return Collection::make($items)->pluck('id'); |
119 | 119 | })->toArray(); |
120 | 120 |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | $relationRepository = $this->getModelRepository($relation, $model); |
64 | 64 | |
65 | 65 | if (!$keepExisting) { |
66 | - $object->$relation()->each(function ($repeaterElement) { |
|
66 | + $object->$relation()->each(function($repeaterElement) { |
|
67 | 67 | $repeaterElement->forceDelete(); |
68 | 68 | }); |
69 | 69 | } |
@@ -236,8 +236,8 @@ discard block |
||
236 | 236 | |
237 | 237 | if (isset($relatedItemFormFields['medias'])) { |
238 | 238 | if (config('twill.media_library.translated_form_fields', false)) { |
239 | - Collection::make($relatedItemFormFields['medias'])->each(function ($rolesWithMedias, $locale) use (&$repeatersMedias, $relation, $relationItem) { |
|
240 | - $repeatersMedias[] = Collection::make($rolesWithMedias)->mapWithKeys(function ($medias, $role) use ($locale, $relation, $relationItem) { |
|
239 | + Collection::make($relatedItemFormFields['medias'])->each(function($rolesWithMedias, $locale) use (&$repeatersMedias, $relation, $relationItem) { |
|
240 | + $repeatersMedias[] = Collection::make($rolesWithMedias)->mapWithKeys(function($medias, $role) use ($locale, $relation, $relationItem) { |
|
241 | 241 | return [ |
242 | 242 | "blocks[$relation-$relationItem->id][$role][$locale]" => $medias, |
243 | 243 | ]; |
@@ -251,8 +251,8 @@ discard block |
||
251 | 251 | } |
252 | 252 | |
253 | 253 | if (isset($relatedItemFormFields['files'])) { |
254 | - Collection::make($relatedItemFormFields['files'])->each(function ($rolesWithFiles, $locale) use (&$repeatersFiles, $relation, $relationItem) { |
|
255 | - $repeatersFiles[] = Collection::make($rolesWithFiles)->mapWithKeys(function ($files, $role) use ($locale, $relation, $relationItem) { |
|
254 | + Collection::make($relatedItemFormFields['files'])->each(function($rolesWithFiles, $locale) use (&$repeatersFiles, $relation, $relationItem) { |
|
255 | + $repeatersFiles[] = Collection::make($rolesWithFiles)->mapWithKeys(function($files, $role) use ($locale, $relation, $relationItem) { |
|
256 | 256 | return [ |
257 | 257 | "blocks[$relation-$relationItem->id][$role][$locale]" => $files, |
258 | 258 | ]; |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | */ |
303 | 303 | protected function getRepeaters() |
304 | 304 | { |
305 | - return collect($this->repeaters)->map(function ($repeater, $key) { |
|
305 | + return collect($this->repeaters)->map(function($repeater, $key) { |
|
306 | 306 | $repeaterName = is_string($repeater) ? $repeater : $key; |
307 | 307 | return [ |
308 | 308 | 'relation' => !empty($repeater['relation']) ? $repeater['relation'] : $this->inferRelationFromRepeaterName($repeaterName), |