area17 / twill

src/Http/Controllers/Admin/FeaturedController.php

Spacing +12 added lines, -12 removed lines

@@ -42,7 +42,7 @@ 
 
         $featuredSources = $this->getFeaturedSources($request, $featuredSection, $filters['search'] ?? '');
 
-        $contentTypes = Collection::make($featuredSources)->map(function ($source, $sourceKey) {
+        $contentTypes = Collection::make($featuredSources)->map(function($source, $sourceKey) {
             return [
                 'label' => $source['name'],
                 'value' => $sourceKey,
@@ -54,7 +54,7 @@ 
 
             return [
                 'source' => [
-                    'content_type' => Arr::first($contentTypes, function ($contentTypeItem) use ($request) {
+                    'content_type' => Arr::first($contentTypes, function($contentTypeItem) use ($request) {
                         return $contentTypeItem['value'] == $request->get('content_type');
                     }),
                     'items' => $source['items'],
@@ -100,7 +100,7 @@ 
     private function getFeaturedItemsByBucket($featuredSection, $featuredSectionKey)
     {
         $bucketRouteConfig = $this->config->get('twill.bucketsRoutes') ?? [$featuredSectionKey => 'featured'];
-        return Collection::make($featuredSection['buckets'])->map(function ($bucket, $bucketKey) use ($featuredSectionKey, $bucketRouteConfig) {
+        return Collection::make($featuredSection['buckets'])->map(function($bucket, $bucketKey) use ($featuredSectionKey, $bucketRouteConfig) {
             $routePrefix = $bucketRouteConfig[$featuredSectionKey];
             return [
                 'id' => $bucketKey,
@@ -109,7 +109,7 @@ 
                 'acceptedSources' => Collection::make($bucket['bucketables'])->pluck('module'),
                 'withToggleFeatured' => $bucket['with_starred_items'] ?? false,
                 'toggleFeaturedLabels' => $bucket['starred_items_labels'] ?? [],
-                'children' => Feature::where('bucket_key', $bucketKey)->with('featured')->get()->map(function ($feature) use ($bucket) {
+                'children' => Feature::where('bucket_key', $bucketKey)->with('featured')->get()->map(function($feature) use ($bucket) {
                     if (($item = $feature->featured) != null) {
                         $forModuleRepository = collect($bucket['bucketables'])->where('module', $feature->featured_type)->first()['repository'] ?? null;
                         $repository = $this->getRepository($feature->featured_type, $forModuleRepository);
@@ -128,7 +128,7 @@ 
                             'thumbnail' => $item->defaultCmsImage(['w' => 100, 'h' => 100]),
                         ] : []);
                     }
-                })->reject(function ($item) {
+                })->reject(function($item) {
                     return is_null($item);
                 })->values()->toArray(),
             ];
@@ -146,8 +146,8 @@ 
         $fetchedModules = [];
         $featuredSources = [];
 
-        Collection::make($featuredSection['buckets'])->map(function ($bucket, $bucketKey) use (&$fetchedModules, $search, $request) {
-            return Collection::make($bucket['bucketables'])->mapWithKeys(function ($bucketable) use (&$fetchedModules, $search, $request) {
+        Collection::make($featuredSection['buckets'])->map(function($bucket, $bucketKey) use (&$fetchedModules, $search, $request) {
+            return Collection::make($bucket['bucketables'])->mapWithKeys(function($bucketable) use (&$fetchedModules, $search, $request) {
 
                 $module = $bucketable['module'];
                 $repository = $this->getRepository($module, $bucketable['repository'] ?? null);
@@ -176,12 +176,12 @@ 
                     'withImage' => $withImage,
                 ]];
             });
-        })->each(function ($bucketables, $bucket) use (&$featuredSources) {
-            $bucketables->each(function ($bucketableData, $bucketable) use (&$featuredSources) {
+        })->each(function($bucketables, $bucket) use (&$featuredSources) {
+            $bucketables->each(function($bucketableData, $bucketable) use (&$featuredSources) {
                 $featuredSources[$bucketable]['name'] = $bucketableData['name'];
                 $featuredSources[$bucketable]['maxPage'] = $bucketableData['items']->lastPage();
                 $featuredSources[$bucketable]['offset'] = $bucketableData['items']->perPage();
-                $featuredSources[$bucketable]['items'] = $bucketableData['items']->map(function ($item) use ($bucketableData, $bucketable) {
+                $featuredSources[$bucketable]['items'] = $bucketableData['items']->map(function($item) use ($bucketableData, $bucketable) {
                     return [
                         'id' => $item->id,
                         'name' => $item->titleInBucket ?? $item->title,
@@ -210,8 +210,8 @@ 
      */
     public function save(Request $request, DB $db)
     {
-        $db->transaction(function () use ($request) {
-            Collection::make($request->get('buckets'))->each(function ($bucketables, $bucketKey) {
+        $db->transaction(function() use ($request) {
+            Collection::make($request->get('buckets'))->each(function($bucketables, $bucketKey) {
                 Feature::where('bucket_key', $bucketKey)->delete();
                 foreach (($bucketables ?? []) as $position => $bucketable) {
                     Feature::create([

src/ValidationServiceProvider.php

Spacing +5 added lines, -5 removed lines

@@ -16,23 +16,23 @@
      */
     public function boot()
     {
-        Validator::extend('absolute_or_relative_url', function ($attribute, $value, $parameters, $validator) {
+        Validator::extend('absolute_or_relative_url', function($attribute, $value, $parameters, $validator) {
             return Str::startsWith($value, '/') || Validator::make([$attribute => $value], [$attribute => 'url'])->passes();
         }, 'The :attribute should be a valid url (absolute or relative)');
 
-        Validator::extend('relative_or_secure_url', function ($attribute, $value, $parameters) {
+        Validator::extend('relative_or_secure_url', function($attribute, $value, $parameters) {
             return Str::startsWith($value, '/') || filter_var($value, FILTER_VALIDATE_URL) !== false && Str::startsWith($value, 'https');
         }, 'The :attribute should be a valid url (relative or https)');
 
-        Validator::extend('web_color', function ($attribute, $value, $parameters, $validator) {
+        Validator::extend('web_color', function($attribute, $value, $parameters, $validator) {
             return preg_match('/^([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/i', $value);
         });
 
-        Validator::extend('phone_number', function ($attribute, $value, $parameters) {
+        Validator::extend('phone_number', function($attribute, $value, $parameters) {
             return preg_match("/^[+]?[0-9\-\ ]*$/", $value);
         });
 
-        Validator::extend('validBlocks', function ($attribute, $value, $parameters, $validator) {
+        Validator::extend('validBlocks', function($attribute, $value, $parameters, $validator) {
             $blockMessages = [];
 
             foreach ($value as $block) {

src/Commands/ListIcons.php

Spacing +3 added lines, -3 removed lines

@@ -65,14 +65,14 @@ 
     {
         return collect(
             config('twill.block_editor.directories.source.icons')
-        )->reduce(function (Collection $keep, $path) {
+        )->reduce(function(Collection $keep, $path) {
             if (!$this->files->exists($path)) {
                 $this->displayError("Directory not found: {$path}");
 
                 return $keep;
             }
 
-            $files = collect($this->files->files($path))->map(function (
+            $files = collect($this->files->files($path))->map(function(
                 SplFileInfo $file
             ) {
                 return [
@@ -92,7 +92,7 @@ 
      */
     public function handle()
     {
-        $icons = $this->getIconList()->filter(function ($icon) {
+        $icons = $this->getIconList()->filter(function($icon) {
             return $this->isAllowed($icon);
         });
 

src/Models/File.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
         return DB::table(config('twill.fileables_table', 'twill_fileables'))->where('file_id', $this->id)->count() === 0;
     }
 
-    public function scopeUnused ($query)
+    public function scopeUnused($query)
     {
         $usedIds = DB::table(config('twill.fileables_table'))->get()->pluck('file_id');
         return $query->whereNotIn('id', $usedIds->toArray())->get();

src/Http/Controllers/Admin/IconsController.php

Spacing +3 added lines, -3 removed lines

@@ -20,12 +20,12 @@ 
     {
         $icons = collect(
             config('twill.block_editor.directories.source.icons')
-        )->reduce(function (Collection $keep, $path) {
+        )->reduce(function(Collection $keep, $path) {
             if (!$this->files->exists($path)) {
                 return $keep;
             }
 
-            $files = collect($this->files->files($path))->map(function (
+            $files = collect($this->files->files($path))->map(function(
                 SplFileInfo $file
             ) {
                 if (in_array($file->getFilename(), config('twill.internal_icons'))) {
@@ -54,7 +54,7 @@ 
             abort(404);
         }
 
-        return response()->stream(function () use ($file) {
+        return response()->stream(function() use ($file) {
             echo $this->files->get($file);
         }, 200, ["Content-Type" => "image/svg+xml"]);
 

src/Services/Blocks/BlockMaker.php

Spacing +2 added lines, -2 removed lines

@@ -353,7 +353,7 @@ 
 
         return collect(
             config('twill.block_editor.directories.source.icons')
-        )->reduce(function ($keep, $path) use ($icon) {
+        )->reduce(function($keep, $path) use ($icon) {
             if ($keep) {
                 return $keep;
             }
@@ -362,7 +362,7 @@ 
                 return null;
             }
 
-            return collect($this->files->files($path))->reduce(function ($keep, SplFileInfo $file) use ($icon) {
+            return collect($this->files->files($path))->reduce(function($keep, SplFileInfo $file) use ($icon) {
                 if ($keep) {
                     return $keep;
                 }

src/Repositories/Behaviors/HandleRepeaters.php

Spacing +6 added lines, -6 removed lines

@@ -63,7 +63,7 @@ 
         $relationRepository = $this->getModelRepository($relation, $model);
 
         if (!$keepExisting) {
-            $object->$relation()->each(function ($repeaterElement) {
+            $object->$relation()->each(function($repeaterElement) {
                 $repeaterElement->forceDelete();
             });
         }
@@ -236,8 +236,8 @@ 
 
             if (isset($relatedItemFormFields['medias'])) {
                 if (config('twill.media_library.translated_form_fields', false)) {
-                    Collection::make($relatedItemFormFields['medias'])->each(function ($rolesWithMedias, $locale) use (&$repeatersMedias, $relation, $relationItem) {
-                        $repeatersMedias[] = Collection::make($rolesWithMedias)->mapWithKeys(function ($medias, $role) use ($locale, $relation, $relationItem) {
+                    Collection::make($relatedItemFormFields['medias'])->each(function($rolesWithMedias, $locale) use (&$repeatersMedias, $relation, $relationItem) {
+                        $repeatersMedias[] = Collection::make($rolesWithMedias)->mapWithKeys(function($medias, $role) use ($locale, $relation, $relationItem) {
                             return [
                                 "blocks[$relation-$relationItem->id][$role][$locale]" => $medias,
                             ];
@@ -251,8 +251,8 @@ 
             }
 
             if (isset($relatedItemFormFields['files'])) {
-                Collection::make($relatedItemFormFields['files'])->each(function ($rolesWithFiles, $locale) use (&$repeatersFiles, $relation, $relationItem) {
-                    $repeatersFiles[] = Collection::make($rolesWithFiles)->mapWithKeys(function ($files, $role) use ($locale, $relation, $relationItem) {
+                Collection::make($relatedItemFormFields['files'])->each(function($rolesWithFiles, $locale) use (&$repeatersFiles, $relation, $relationItem) {
+                    $repeatersFiles[] = Collection::make($rolesWithFiles)->mapWithKeys(function($files, $role) use ($locale, $relation, $relationItem) {
                         return [
                             "blocks[$relation-$relationItem->id][$role][$locale]" => $files,
                         ];
@@ -302,7 +302,7 @@ 
      */
     protected function getRepeaters()
     {
-        return collect($this->repeaters)->map(function ($repeater, $key) {
+        return collect($this->repeaters)->map(function($repeater, $key) {
             $repeaterName = is_string($repeater) ? $repeater : $key;
             return [
                 'relation' => !empty($repeater['relation']) ? $repeater['relation'] : $this->inferRelationFromRepeaterName($repeaterName),

src/Models/Media.php

Spacing +7 added lines, -7 removed lines

@@ -23,18 +23,18 @@ 
 
     public function __construct(array $attributes = [])
     {
-        $this->fillable(array_merge($this->fillable, Collection::make(config('twill.media_library.extra_metadatas_fields'))->map(function ($field) {
+        $this->fillable(array_merge($this->fillable, Collection::make(config('twill.media_library.extra_metadatas_fields'))->map(function($field) {
             return $field['name'];
         })->toArray()));
 
-        Collection::make(config('twill.media_library.translatable_metadatas_fields'))->each(function ($field) {
+        Collection::make(config('twill.media_library.translatable_metadatas_fields'))->each(function($field) {
             $this->casts[$field] = 'json';
         });
 
         parent::__construct($attributes);
     }
 
-    public function scopeUnused ($query)
+    public function scopeUnused($query)
     {
         $usedIds = DB::table(config('twill.mediables_table'))->get()->pluck('media_id');
         return $query->whereNotIn('id', $usedIds->toArray())->get();
@@ -75,7 +75,7 @@ 
             'medium' => ImageService::getUrl($this->uuid, ["h" => "430"]),
             'width' => $this->width,
             'height' => $this->height,
-            'tags' => $this->tags->map(function ($tag) {
+            'tags' => $this->tags->map(function($tag) {
                 return $tag->name;
             }),
             'deleteUrl' => $this->canDeleteSafely() ? moduleRoute('medias', 'media-library', 'destroy', $this->id) : null,
@@ -87,7 +87,7 @@ 
                     'caption' => $this->caption,
                     'altText' => $this->alt_text,
                     'video' => null,
-                ] + Collection::make(config('twill.media_library.extra_metadatas_fields'))->mapWithKeys(function ($field) {
+                ] + Collection::make(config('twill.media_library.extra_metadatas_fields'))->mapWithKeys(function($field) {
                     return [
                         $field['name'] => $this->{$field['name']},
                     ];
@@ -142,7 +142,7 @@ 
 
         if ($this->update($fields) && $this->isReferenced())
         {
-            DB::table(config('twill.mediables_table', 'twill_mediables'))->where('media_id', $this->id)->get()->each(function ($mediable) use ($prevWidth, $prevHeight) {
+            DB::table(config('twill.mediables_table', 'twill_mediables'))->where('media_id', $this->id)->get()->each(function($mediable) use ($prevWidth, $prevHeight) {
                 
                 if ($prevWidth != $this->width) {
                     $mediable->crop_x = 0;
@@ -154,7 +154,7 @@ 
                     $mediable->crop_h = $this->height;
                 }
 
-                DB::table(config('twill.mediables_table', 'twill_mediables'))->where('id', $mediable->id)->update((array)$mediable);
+                DB::table(config('twill.mediables_table', 'twill_mediables'))->where('id', $mediable->id)->update((array) $mediable);
             });
         }
     }

src/Commands/ModuleMakeDeprecated.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 
         $this->call('twill:make:module', [
             'moduleName' => $this->argument('moduleName'),
-        ] + $options->mapWithKeys(function ($value, $key) {
+        ] + $options->mapWithKeys(function($value, $key) {
             return ["--{$key}" => $value];
         })->toArray());
     }