area17 / twill

src/Repositories/Behaviors/HandleBlocks.php

Spacing +12 added lines, -12 removed lines

@@ -105,7 +105,7 @@ 
         }
 
         $blockRepository->bulkDelete($object->blocks()->pluck('id')->toArray());
-        $this->getBlocks($object, $fields)->each(function ($block) use ($blockRepository) {
+        $this->getBlocks($object, $fields)->each(function($block) use ($blockRepository) {
             $this->createBlock($blockRepository, $block);
         });
     }
@@ -122,7 +122,7 @@ 
         $blockCreated = $blockRepository->create($blockFields);
 
         // Handle child blocks
-        $blockFields['blocks']->each(function ($childBlock) use ($blockCreated, $blockRepository) {
+        $blockFields['blocks']->each(function($childBlock) use ($blockCreated, $blockRepository) {
             $childBlock['parent_id'] = $blockCreated->id;
             $this->createBlock($blockRepository, $childBlock);
         });
@@ -237,9 +237,9 @@ 
                     ];
                 }
 
-                $fields['blocksFields'][] = Collection::make($block['content'])->filter(function ($value, $key) {
+                $fields['blocksFields'][] = Collection::make($block['content'])->filter(function($value, $key) {
                     return $key !== "browsers";
-                })->map(function ($value, $key) use ($block) {
+                })->map(function($value, $key) use ($block) {
                     return [
                         'name' => "blocks[$block->id][$key]",
                         'value' => $value,
@@ -252,15 +252,15 @@ 
 
                 if ($medias) {
                     if (config('twill.media_library.translated_form_fields', false)) {
-                        $fields['blocksMedias'][] = Collection::make($medias)->mapWithKeys(function ($mediasByLocale, $locale) use ($block) {
-                            return Collection::make($mediasByLocale)->mapWithKeys(function ($value, $key) use ($block, $locale) {
+                        $fields['blocksMedias'][] = Collection::make($medias)->mapWithKeys(function($mediasByLocale, $locale) use ($block) {
+                            return Collection::make($mediasByLocale)->mapWithKeys(function($value, $key) use ($block, $locale) {
                                 return [
                                     "blocks[$block->id][$key][$locale]" => $value,
                                 ];
                             });
                         })->filter()->toArray();
                     } else {
-                        $fields['blocksMedias'][] = Collection::make($medias)->mapWithKeys(function ($value, $key) use ($block) {
+                        $fields['blocksMedias'][] = Collection::make($medias)->mapWithKeys(function($value, $key) use ($block) {
                             return [
                                 "blocks[$block->id][$key]" => $value,
                             ];
@@ -271,8 +271,8 @@ 
                 $files = $blockFormFields['files'];
 
                 if ($files) {
-                    Collection::make($files)->each(function ($rolesWithFiles, $locale) use (&$fields, $block) {
-                        $fields['blocksFiles'][] = Collection::make($rolesWithFiles)->mapWithKeys(function ($files, $role) use ($locale, $block) {
+                    Collection::make($files)->each(function($rolesWithFiles, $locale) use (&$fields, $block) {
+                        $fields['blocksFiles'][] = Collection::make($rolesWithFiles)->mapWithKeys(function($files, $role) use ($locale, $block) {
                             return [
                                 "blocks[$block->id][$role][$locale]" => $files,
                             ];
@@ -311,7 +311,7 @@ 
      */
     protected function getBlockBrowsers($block)
     {
-        return Collection::make($block['content']['browsers'])->mapWithKeys(function ($ids, $relation) use ($block) {
+        return Collection::make($block['content']['browsers'])->mapWithKeys(function($ids, $relation) use ($block) {
             if (Schema::hasTable(config('twill.related_table', 'twill_related')) && $block->getRelated($relation)->isNotEmpty()) {
                 $items = $this->getFormFieldsForRelatedBrowser($block, $relation);
                 foreach ($items as &$item) {
@@ -342,9 +342,9 @@ 
                     $sortedRelatedItems[$item->id] = $item;
                 }
 
-                $items = Collection::make(array_values($sortedRelatedItems))->filter(function ($value) {
+                $items = Collection::make(array_values($sortedRelatedItems))->filter(function($value) {
                     return is_object($value);
-                })->map(function ($relatedElement) use ($relation) {
+                })->map(function($relatedElement) use ($relation) {
                     return [
                         'id' => $relatedElement->id,
                         'name' => $relatedElement->titleInBrowser ?? $relatedElement->title,

src/Repositories/BlockRepository.php

Spacing +4 added lines, -4 removed lines

@@ -47,8 +47,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) [
@@ -76,7 +76,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);
                 });
             }
@@ -109,7 +109,7 @@ 
         $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();
 

src/Helpers/helpers.php

Spacing +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
 if (!function_exists('dumpUsableSqlQuery')) {
     function dumpUsableSqlQuery($query)
     {
-        dd(vsprintf(str_replace('?', '%s', $query->toSql()), array_map(function ($binding) {
+        dd(vsprintf(str_replace('?', '%s', $query->toSql()), array_map(function($binding) {
             return is_numeric($binding) ? $binding : "'{$binding}'";
         }, $query->getBindings())));
     }
@@ -202,12 +202,12 @@ 
     {
         $blockList = app(BlockCollection::class)->getBlockList();
 
-        $appBlocksList = $blockList->filter(function (Block $block) {
+        $appBlocksList = $blockList->filter(function(Block $block) {
             return $block->source !== A17\Twill\Services\Blocks\Block::SOURCE_TWILL;
         });
 
         $finalBlockList = $blockList->filter(
-            function (Block $block) use ($blocks, $groups, $appBlocksList) {
+            function(Block $block) use ($blocks, $groups, $appBlocksList) {
                 if ($block->group === A17\Twill\Services\Blocks\Block::SOURCE_TWILL) {
                     if (!collect(
                         config('twill.block_editor.use_twill_blocks')
@@ -217,7 +217,7 @@ 
 
                     /** @var \Illuminate\Support\Collection<Block> $appBlocksList */
                     if (count($appBlocksList) > 0 && $appBlocksList->contains(
-                        function ($appBlock) use ($block) {
+                        function($appBlock) use ($block) {
                             return $appBlock->name === $block->name;
                         })
                     ) {

src/Http/Controllers/Admin/BlocksController.php

Spacing +3 added lines, -3 removed lines

@@ -53,11 +53,11 @@ 
         $this->getChildrenPreview($block['blocks'], $blocksCollection, $newBlock->id, $blockId, $blockRepository);
 
         $renderedBlocks = $blocksCollection->where('parent_id', null)
-            ->map(function ($blockToRender) use ($block, $blocksCollection, $viewFactory, $config) {
+            ->map(function($blockToRender) use ($block, $blocksCollection, $viewFactory, $config) {
                 try {
                     if ($config->get('twill.block_editor.block_preview_render_childs') ?? true) {
                         $childBlocks = $blocksCollection->where('parent_id', $blockToRender->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, [
@@ -123,7 +123,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/Http/Controllers/Admin/ModuleController.php

Spacing +16 added lines, -16 removed lines

@@ -362,7 +362,7 @@ 
             "$this->viewPrefix.index",
             "twill::$this->moduleName.index",
             "twill::layouts.listing",
-        ])->first(function ($view) {
+        ])->first(function($view) {
             return View::exists($view);
         });
 
@@ -471,7 +471,7 @@ 
             "$this->viewPrefix.form",
             "twill::$this->moduleName.form",
             "twill::layouts.form",
-        ])->first(function ($view) {
+        ])->first(function($view) {
             return View::exists($view);
         });
 
@@ -502,7 +502,7 @@ 
             "$this->viewPrefix.form",
             "twill::$this->moduleName.form",
             "twill::layouts.form",
-        ])->first(function ($view) {
+        ])->first(function($view) {
             return View::exists($view);
         });
 
@@ -630,7 +630,7 @@ 
             "$this->viewPrefix.form",
             "twill::$this->moduleName.form",
             "twill::layouts.form",
-        ])->first(function ($view) {
+        ])->first(function($view) {
             return View::exists($view);
         });
 
@@ -892,7 +892,7 @@ 
         $query = $this->request->input('q');
         $tags = $this->repository->getTags($query);
 
-        return Response::json(['items' => $tags->map(function ($tag) {
+        return Response::json(['items' => $tags->map(function($tag) {
             return $tag->name;
         })], 200);
     }
@@ -989,8 +989,8 @@ 
     protected function getIndexTableData($items)
     {
         $translated = $this->moduleHas('translations');
-        return $items->map(function ($item) use ($translated) {
-            $columnsData = Collection::make($this->indexColumns)->mapWithKeys(function ($column) use ($item) {
+        return $items->map(function($item) use ($translated) {
+            $columnsData = Collection::make($this->indexColumns)->mapWithKeys(function($column) use ($item) {
                 return $this->getItemColumnData($item, $column);
             })->toArray();
 
@@ -1266,7 +1266,7 @@ 
             'feature',
             'bulkFeature',
             'bulkDelete',
-        ])->mapWithKeys(function ($endpoint) {
+        ])->mapWithKeys(function($endpoint) {
             return [
                 $endpoint . 'Url' => $this->getIndexOption($endpoint) ? moduleRoute(
                     $this->moduleName,
@@ -1284,7 +1284,7 @@ 
      */
     protected function getIndexOption($option)
     {
-        return once(function () use ($option) {
+        return once(function() use ($option) {
             $customOptionNamesMapping = [
                 'store' => 'create',
             ];
@@ -1341,8 +1341,8 @@ 
     {
         $withImage = $this->moduleHas('medias');
 
-        return $items->map(function ($item) use ($withImage) {
-            $columnsData = Collection::make($this->browserColumns)->mapWithKeys(function ($column) use ($item) {
+        return $items->map(function($item) use ($withImage) {
+            $columnsData = Collection::make($this->browserColumns)->mapWithKeys(function($column) use ($item) {
                 return $this->getItemColumnData($item, $column);
             })->toArray();
 
@@ -1408,7 +1408,7 @@ 
                     $fieldSplitted = explode('|', $field);
                     if (count($fieldSplitted) > 1) {
                         $requestValue = $requestFilters[$key];
-                        Collection::make($fieldSplitted)->each(function ($scopeKey) use (&$scope, $requestValue) {
+                        Collection::make($fieldSplitted)->each(function($scopeKey) use (&$scope, $requestValue) {
                             $scope[$scopeKey] = $requestValue;
                         });
                     } else {
@@ -1586,11 +1586,11 @@ 
      */
     protected function validateFormRequest()
     {
-        $unauthorizedFields = Collection::make($this->fieldsPermissions)->filter(function ($permission, $field) {
+        $unauthorizedFields = Collection::make($this->fieldsPermissions)->filter(function($permission, $field) {
             return Auth::guard('twill_users')->user()->cannot($permission);
         })->keys();
 
-        $unauthorizedFields->each(function ($field) {
+        $unauthorizedFields->each(function($field) {
             $this->request->offsetUnset($field);
         });
 
@@ -1642,7 +1642,7 @@ 
                 $singularName = Str::singular($name);
                 $modelClass = config('twill.namespace') . '\\Models\\' . Str::studly($singularName);
 
-                if(!class_exists($modelClass)) {
+                if (!class_exists($modelClass)) {
                     $modelClass = $this->getCapsuleByModule($name)['model'];
                 }
 
@@ -1896,7 +1896,7 @@ 
      */
     public function getRepeaterList()
     {
-        return app(BlockCollection::class)->getRepeaterList()->mapWithKeys(function (Block $repeater) {
+        return app(BlockCollection::class)->getRepeaterList()->mapWithKeys(function(Block $repeater) {
             return [$repeater->name => $repeater->toList()];
         });
     }

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,15 +81,15 @@ 
 
         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) {
                 $data = $this->colorize(
                     $this->option('short') ? $block->toShortList() : $block->toList()
                 );
@@ -97,7 +97,7 @@ 
                 unset($data['rules'], $data['rulesForTranslatedFields']);
                 return $data;
             })
-            ->sortBy(function ($block) {
+            ->sortBy(function($block) {
                 return [$block['group'], $block['title']];
             });
     }
@@ -155,7 +155,7 @@ 
         if (filled($filter = $this->argument('filter'))) {
             return !$block
                 ->toList()
-                ->reduce(function ($keep, $element) use ($filter) {
+                ->reduce(function($keep, $element) use ($filter) {
                     if (is_array($element)) {
                         return false;
                     }

src/Services/Blocks/Block.php

Spacing +5 added lines, -5 removed lines

@@ -272,15 +272,15 @@ 
         $this->isNewFormat = $this->isNewFormat($contents);
         $this->contents = $contents;
 
-        $this->parseArrayProperty('ValidationRules', $contents, $this->name, function ($value) {
+        $this->parseArrayProperty('ValidationRules', $contents, $this->name, function($value) {
             $this->rules = $value ?? $this->rules;
         });
 
-        $this->parseArrayProperty('ValidationRulesForTranslatedFields', $contents, $this->name, function ($value) {
+        $this->parseArrayProperty('ValidationRulesForTranslatedFields', $contents, $this->name, function($value) {
             $this->rulesForTranslatedFields = $value ?? $this->rulesForTranslatedFields;
         });
 
-        $this->parseMixedProperty('titleField', $contents, $this->name, function ($value, $options) {
+        $this->parseMixedProperty('titleField', $contents, $this->name, function($value, $options) {
             $this->titleField = $value;
             $this->hideTitlePrefix = (boolean) ($options['hidePrefix'] ?? false);
         });
@@ -423,14 +423,14 @@ 
             return $value;
         }
 
-        if ($configBlock = collect(config("twill.block_editor.blocks"))->filter(function ($block) use ($blockName) {
+        if ($configBlock = collect(config("twill.block_editor.blocks"))->filter(function($block) use ($blockName) {
             return Str::contains($block['component'], $blockName);
         })->first()) {
             if ($value = ($configBlock[$property] ?? null)) {
                 return $value;
             }
         }
-        if ($configRepeater = collect(config("twill.block_editor.repeaters"))->filter(function ($repeater) use ($blockName) {
+        if ($configRepeater = collect(config("twill.block_editor.repeaters"))->filter(function($repeater) use ($blockName) {
             return Str::contains($repeater['component'], $blockName);
         })->first()) {
             if ($value = ($configRepeater[$property] ?? null)) {

src/Services/Blocks/BlockCollection.php

Spacing +18 added lines, -18 removed lines

@@ -52,12 +52,12 @@ 
     public function findByName($search, $sources = [])
     {
         return $this->collect()
-            ->filter(function ($block) use ($search, $sources) {
+            ->filter(function($block) use ($search, $sources) {
                 return $block->name == $search &&
                     (blank($sources) ||
                     collect($sources)->contains($block->source));
             })
-            ->sortBy(function ($block) {
+            ->sortBy(function($block) {
                 return $block->source === 'app' ? 0 : 1;
             })
             ->first();
@@ -69,7 +69,7 @@ 
     public function getBlocks()
     {
         return $this->collect()
-            ->filter(function ($block) {
+            ->filter(function($block) {
                 return $block->type === Block::TYPE_BLOCK;
             })
             ->values();
@@ -106,7 +106,7 @@ 
         }
 
         return collect($this->fileSystem->files($directory))
-            ->map(function ($file) use ($source, $type) {
+            ->map(function($file) use ($source, $type) {
                 return Block::make($file, $type, $source);
             });
     }
@@ -119,7 +119,7 @@ 
         $this->paths = collect(
             config('twill.block_editor.directories.source.blocks')
         )
-            ->map(function ($path) {
+            ->map(function($path) {
                 $path['type'] = Block::TYPE_BLOCK;
 
                 return $path;
@@ -127,7 +127,7 @@ 
             ->merge(
                 collect(
                     config('twill.block_editor.directories.source.repeaters')
-                )->map(function ($path) {
+                )->map(function($path) {
                     $path['type'] = Block::TYPE_REPEATER;
 
                     return $path;
@@ -165,12 +165,12 @@ 
         $this->generatePaths();
 
         $this->items = collect($this->paths)
-            ->reduce(function (Collection $keep, $path) {
+            ->reduce(function(Collection $keep, $path) {
                 $this->readBlocks(
                     $path['path'],
                     $path['source'],
                     $path['type']
-                )->each(function ($block) use ($keep) {
+                )->each(function($block) use ($keep) {
                     $keep->push($block);
 
                     return $keep;
@@ -181,15 +181,15 @@ 
             ->toArray();
 
         $this->items = $this->collect()
-            ->each(function (Block $block) {
+            ->each(function(Block $block) {
                 $block->setSource($this->detectCustomSources($block));
             })
             ->toArray();
 
         // remove duplicate Twill blocks
         $appBlocks = $this->collect()->whereIn('source', [Block::SOURCE_APP, Block::SOURCE_CUSTOM]);
-        $this->items = $this->collect()->filter(function ($item) use ($appBlocks) {
-            return !$appBlocks->contains(function ($block) use ($item) {
+        $this->items = $this->collect()->filter(function($item) use ($appBlocks) {
+            return !$appBlocks->contains(function($block) use ($item) {
                 return $item->source === Block::SOURCE_TWILL && $item->name === $block->name;
             });
         })->values()->toArray();
@@ -212,12 +212,12 @@ 
      */
     public function addBlocksFromConfig(Collection $items, $type)
     {
-        $items->reject(function ($value, $blockName) use ($type) {
-            return $this->contains(function ($block) use ($blockName, $type) {
+        $items->reject(function($value, $blockName) use ($type) {
+            return $this->contains(function($block) use ($blockName, $type) {
                 return $block->name === $blockName && $block->type === $type;
             }) ? [$blockName, $value] : false;
         })
-            ->each(function ($block, $blockName) use ($type) {
+            ->each(function($block, $blockName) use ($type) {
                 if ($block['compiled'] ?? false) {
                     $file = null;
                 } else {
@@ -256,7 +256,7 @@ 
      */
     public function logDeprecatedBlockConfig($blockName, $type)
     {
-        $path = $this->paths->filter(function ($path) use ($type) {
+        $path = $this->paths->filter(function($path) use ($type) {
             return $path['source'] === Block::SOURCE_APP && $path['type'] === $type;
         })->pluck('path')->join(', ', ' or ');
 
@@ -278,7 +278,7 @@ 
     public function findFileByComponentName($componentName)
     {
         $filename = str_replace('a17-block-', '', $componentName) . '.blade.php';
-        $paths = $this->paths->pluck('path')->filter(function ($path) {
+        $paths = $this->paths->pluck('path')->filter(function($path) {
             return $this->fileSystem->exists($path);
         })->toArray();
 
@@ -304,7 +304,7 @@ 
      */
     public function list()
     {
-        return $this->collect()->map(function (Block $block) {
+        return $this->collect()->map(function(Block $block) {
             return $block->toList();
         });
     }
@@ -323,7 +323,7 @@ 
     public function getRepeaters()
     {
         return $this->collect()
-            ->filter(function ($block) {
+            ->filter(function($block) {
                 return $block->type === Block::TYPE_REPEATER;
             })
             ->values();

src/Models/Behaviors/HasBlocks.php

Spacing +3 added lines, -3 removed lines

@@ -23,17 +23,17 @@
     public function renderNamedBlocks($name = 'default', $renderChilds = true, $blockViewMappings = [], $data = [])
     {
         return $this->blocks
-            ->filter(function ($block) use ($name) {
+            ->filter(function($block) use ($name) {
                 return $name === 'default'
                     ? ($block->editor_name === $name || $block->editor_name === null)
                     : $block->editor_name === $name;
             })
             ->where('parent_id', null)
-            ->map(function ($block) use ($blockViewMappings, $renderChilds, $data) {
+            ->map(function($block) use ($blockViewMappings, $renderChilds, $data) {
                 if ($renderChilds) {
                     $childBlocks = $this->blocks->where('parent_id', $block->id);
 
-                    $renderedChildViews = $childBlocks->map(function ($childBlock) use ($blockViewMappings, $data) {
+                    $renderedChildViews = $childBlocks->map(function($childBlock) use ($blockViewMappings, $data) {
                         $class = BlockConfig::getForType($childBlock->type);
                         $view = $class->getBlockView($blockViewMappings);
                         $data = $class->getData($data, $childBlock);