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/Http/Controllers/Admin/BlocksController.php

Spacing +3 added lines, -3 removed lines

@@ -51,10 +51,10 @@ 
 
         $this->getChildrenPreview($block['blocks'], $blocksCollection, $newBlock->id, $blockId, $blockRepository);
 
-        $renderedBlocks = $blocksCollection->where('parent_id', null)->map(function ($block) use ($blocksCollection, $viewFactory, $config) {
+        $renderedBlocks = $blocksCollection->where('parent_id', null)->map(function($block) use ($blocksCollection, $viewFactory, $config) {
             if ($config->get('twill.block_editor.block_preview_render_childs') ?? true) {
                 $childBlocks = $blocksCollection->where('parent_id', $block->id);
-                $renderedChildViews = $childBlocks->map(function ($childBlock) use ($viewFactory, $config) {
+                $renderedChildViews = $childBlocks->map(function($childBlock) use ($viewFactory, $config) {
                     $view = $this->getBlockView($childBlock->type, $config);
 
                     return $viewFactory->exists($view) ? $viewFactory->make($view, [
@@ -108,7 +108,7 @@ 
 
     protected function getChildrenPreview($blocks, $blocksCollection, $parentId, &$blockId, $blockRepository)
     {
-        $blocks->each(function ($childBlock) use (&$blockId, $parentId, $blocksCollection, $blockRepository) {
+        $blocks->each(function($childBlock) use (&$blockId, $parentId, $blocksCollection, $blockRepository) {
             $childBlock['parent_id'] = $parentId;
             $blockId++;
             $newChildBlock = $blockRepository->createForPreview($childBlock);

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/Commands/ListBlocks.php

Spacing +7 added lines, -7 removed lines

@@ -47,7 +47,7 @@ 
     {
         $this->blockCollection
             ->getMissingDirectories()
-            ->each(function ($directory) {
+            ->each(function($directory) {
                 $this->error("Directory not found: {$directory}");
             });
     }
@@ -61,7 +61,7 @@ 
         return $blockCollection
             ->first()
             ->keys()
-            ->map(function ($key) {
+            ->map(function($key) {
                 return Str::studly($key);
             })
             ->toArray();
@@ -81,20 +81,20 @@ 
 
         return $this->blockCollection
             ->collect()
-            ->reject(function (Block $block) use ($sourceFiltered) {
+            ->reject(function(Block $block) use ($sourceFiltered) {
                 return $sourceFiltered && !$this->option($block->source);
             })
-            ->reject(function (Block $block) use ($typeFiltered) {
+            ->reject(function(Block $block) use ($typeFiltered) {
                 return $this->dontPassTextFilter($block) ||
                     ($typeFiltered &&
                     !$this->option(Str::plural($block->type)));
             })
-            ->map(function (Block $block) {
+            ->map(function(Block $block) {
                 return $this->colorize(
                     $this->option('short') ? $block->toShortList() : $block->toList()
                 );
             })
-            ->sortBy(function ($block) {
+            ->sortBy(function($block) {
                 return [$block['group'], $block['title']];
             });
     }
@@ -152,7 +152,7 @@ 
         if (filled($filter = $this->argument('filter'))) {
             return !$block
                 ->toList()
-                ->reduce(function ($keep, $element) use ($filter) {
+                ->reduce(function($keep, $element) use ($filter) {
                     return $keep ||
                     Str::contains(
                         Str::lower($element),

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/BlockRepository.php

Spacing +5 added lines, -5 removed lines

@@ -46,8 +46,8 @@ 
         if (Schema::hasTable(config('twill.related_table', 'twill_related'))) {
             $relatedItems = Collection::make();
 
-            Collection::make($fields['browsers'])->each(function ($items, $browserName) use (&$relatedItems) {
-                Collection::make($items)->each(function ($item) use ($browserName, &$relatedItems) {
+            Collection::make($fields['browsers'])->each(function($items, $browserName) use (&$relatedItems) {
+                Collection::make($items)->each(function($item) use ($browserName, &$relatedItems) {
                     try {
                         $repository = $this->getModelRepository($item['endpointType'] ?? $browserName);
                         $relatedItems->push((object) [
@@ -75,7 +75,7 @@ 
     {
         if (Schema::hasTable(config('twill.related_table', 'twill_related'))) {
             if (isset($fields['browsers'])) {
-                Collection::make($fields['browsers'])->each(function ($items, $browserName) use ($object) {
+                Collection::make($fields['browsers'])->each(function($items, $browserName) use ($object) {
                     $object->saveRelated($items, $browserName);
                 });
             }
@@ -107,14 +107,14 @@ 
             $blocksList = app(BlockCollection::class)->getBlockList();
         }
 
-        $block['type'] = $blocksList->keyBy('name')->search(function ($blockConfig) use ($block) {
+        $block['type'] = $blocksList->keyBy('name')->search(function($blockConfig) use ($block) {
             return $blockConfig['component'] === $block['type'];
         });
 
         $block['content'] = empty($block['content']) ? new \stdClass : (object) $block['content'];
 
         if ($block['browsers']) {
-            $browsers = Collection::make($block['browsers'])->map(function ($items) {
+            $browsers = Collection::make($block['browsers'])->map(function($items) {
                 return Collection::make($items)->pluck('id');
             })->toArray();