area17 / twill

src/Repositories/Behaviors/HandleBlocks.php

Spacing +12 added lines, -12 removed lines

@@ -74,7 +74,7 @@ 
         $blockRepository = app(BlockRepository::class);
 
         $blockRepository->bulkDelete($object->blocks()->pluck('id')->toArray());
-        $this->getBlocks($object, $fields)->each(function ($block) use ($object, $blockRepository) {
+        $this->getBlocks($object, $fields)->each(function($block) use ($object, $blockRepository) {
             $this->createBlock($blockRepository, $block);
         });
     }
@@ -92,7 +92,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);
         });
@@ -203,9 +203,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,
@@ -218,15 +218,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,
                             ];
@@ -237,8 +237,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,
                             ];
@@ -277,7 +277,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) {
@@ -294,9 +294,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/Commands/GenerateBlocks.php

Spacing +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
             ->collect()
             ->where('compiled', true)
             ->whereIn('source', [Block::SOURCE_APP, Block::SOURCE_CUSTOM])
-            ->map(function ($block) {
+            ->map(function($block) {
                 $blockName = str_replace('a17-block-', '', $block->component);
                 $basename = str_replace('.blade.php', '', $block->fileName);
 
@@ -93,7 +93,7 @@ 
                     $this->filesystem->put($vueBlockPath, $vueBlockContent);
                     $this->info("Block " . Str::title($blockName) . " generated successfully");
                 } else {
-                    $this->info("Skipping block " .  Str::title($blockName) . ".");
+                    $this->info("Skipping block " . Str::title($blockName) . ".");
                 }
             });
 

src/Http/Controllers/Admin/ModuleController.php

Spacing +15 added lines, -15 removed lines

@@ -355,7 +355,7 @@ 
             "$this->viewPrefix.index",
             "twill::$this->moduleName.index",
             "twill::layouts.listing",
-        ])->first(function ($view) {
+        ])->first(function($view) {
             return View::exists($view);
         });
 
@@ -460,7 +460,7 @@ 
             "$this->viewPrefix.form",
             "twill::$this->moduleName.form",
             "twill::layouts.form",
-        ])->first(function ($view) {
+        ])->first(function($view) {
             return View::exists($view);
         });
 
@@ -491,7 +491,7 @@ 
             "$this->viewPrefix.form",
             "twill::$this->moduleName.form",
             "twill::layouts.form",
-        ])->first(function ($view) {
+        ])->first(function($view) {
             return View::exists($view);
         });
 
@@ -615,7 +615,7 @@ 
             "$this->viewPrefix.form",
             "twill::$this->moduleName.form",
             "twill::layouts.form",
-        ])->first(function ($view) {
+        ])->first(function($view) {
             return View::exists($view);
         });
 
@@ -863,7 +863,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);
     }
@@ -951,8 +951,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();
 
@@ -1213,7 +1213,7 @@ 
             'feature',
             'bulkFeature',
             'bulkDelete',
-        ])->mapWithKeys(function ($endpoint) {
+        ])->mapWithKeys(function($endpoint) {
             return [
                 $endpoint . 'Url' => $this->getIndexOption($endpoint) ? moduleRoute(
                     $this->moduleName,
@@ -1231,7 +1231,7 @@ 
      */
     protected function getIndexOption($option)
     {
-        return once(function () use ($option) {
+        return once(function() use ($option) {
             $customOptionNamesMapping = [
                 'store' => 'create',
             ];
@@ -1288,8 +1288,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();
 
@@ -1355,7 +1355,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 {
@@ -1531,11 +1531,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);
         });
 
@@ -1778,7 +1778,7 @@ 
      */
     public function getRepeaterList()
     {
-        return app(BlockCollection::class)->getRepeaterList()->mapWithKeys(function ($repeater) {
+        return app(BlockCollection::class)->getRepeaterList()->mapWithKeys(function($repeater) {
             return [$repeater['name'] => $repeater];
         });
     }

src/Services/Assets/Twill.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
     private function readManifest()
     {
         try {
-            return Cache::rememberForever('twill-manifest', function () {
+            return Cache::rememberForever('twill-manifest', function() {
                 return $this->readJson($this->getManifestFilename());
             });
         } catch (\Exception $e) {

src/Services/Routing/HasRoutes.php

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
         $routesFile
     ) {
         if (file_exists($routesFile)) {
-            $hostRoutes = function ($router) use (
+            $hostRoutes = function($router) use (
                 $middlewares,
                 $namespace,
                 $routesFile
@@ -27,7 +27,7 @@ 
                         'namespace' => $namespace,
                         'middleware' => $middlewares,
                     ],
-                    function ($router) use ($routesFile) {
+                    function($router) use ($routesFile) {
                         require $routesFile;
                     }
                 );
@@ -126,7 +126,7 @@ 
         $manager = (new Manager());
 
         $manager->getCapsuleList()
-                ->each(function ($capsule) use ($router, $manager) {
+                ->each(function($capsule) use ($router, $manager) {
                     $this->registerCapsuleRoutes($router, $capsule, $manager);
                 });
     }

src/Services/Blocks/BlockCollection.php

Spacing +20 added lines, -20 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();
@@ -80,7 +80,7 @@ 
      */
     public function getBlockList()
     {
-        return $this->getBlocks()->map(function (Block $block) {
+        return $this->getBlocks()->map(function(Block $block) {
             return $block->toList();
         });
     }
@@ -108,7 +108,7 @@ 
         }
 
         return collect($this->fileSystem->files($directory))
-            ->map(function ($file) use ($source, $type) {
+            ->map(function($file) use ($source, $type) {
                 return new Block($file, $type, $source);
             });
     }
@@ -121,7 +121,7 @@ 
         $this->paths = collect(
             config('twill.block_editor.directories.source.blocks')
         )
-            ->map(function ($path) {
+            ->map(function($path) {
                 $path['type'] = Block::TYPE_BLOCK;
 
                 return $path;
@@ -129,7 +129,7 @@ 
             ->merge(
                 collect(
                     config('twill.block_editor.directories.source.repeaters')
-                )->map(function ($path) {
+                )->map(function($path) {
                     $path['type'] = Block::TYPE_REPEATER;
 
                     return $path;
@@ -167,12 +167,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;
@@ -183,15 +183,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();
@@ -214,12 +214,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 {
@@ -260,7 +260,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 ');
 
@@ -282,7 +282,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();
 
@@ -308,7 +308,7 @@ 
      */
     public function list()
     {
-        return $this->collect()->map(function (Block $block) {
+        return $this->collect()->map(function(Block $block) {
             return $block->toList();
         });
     }
@@ -327,7 +327,7 @@ 
     public function getRepeaters()
     {
         return $this->collect()
-            ->filter(function ($block) {
+            ->filter(function($block) {
                 return $block->type === Block::TYPE_REPEATER;
             })
             ->values();
@@ -338,7 +338,7 @@ 
      */
     public function getRepeaterList()
     {
-        return $this->getRepeaters()->map(function (Block $block) {
+        return $this->getRepeaters()->map(function(Block $block) {
             return $block->toList();
         });
     }

src/RouteServiceProvider.php

Spacing +11 added lines, -11 removed lines

@@ -82,11 +82,11 @@ 
         $middlewares,
         $supportSubdomainRouting
     ) {
-        $internalRoutes = function ($router) use (
+        $internalRoutes = function($router) use (
             $middlewares,
             $supportSubdomainRouting
         ) {
-            $router->group(['middleware' => $middlewares], function ($router) {
+            $router->group(['middleware' => $middlewares], function($router) {
                 require __DIR__ . '/../routes/admin.php';
             });
 
@@ -96,7 +96,7 @@ 
                     ? ['supportSubdomainRouting']
                     : [],
                 ],
-                function ($router) {
+                function($router) {
                     require __DIR__ . '/../routes/auth.php';
                 }
             );
@@ -107,7 +107,7 @@ 
                     ? ['twill_auth:twill_users']
                     : [],
                 ],
-                function ($router) {
+                function($router) {
                     require __DIR__ . '/../routes/templates.php';
                 }
             );
@@ -117,7 +117,7 @@ 
             $groupOptions + [
                 'namespace' => $this->namespace . '\Admin',
             ],
-            function ($router) use ($internalRoutes, $supportSubdomainRouting) {
+            function($router) use ($internalRoutes, $supportSubdomainRouting) {
                 $router->group(
                     [
                         'domain' => config('twill.admin_app_url'),
@@ -148,7 +148,7 @@ 
                         config('twill.admin_middleware_group', 'web'),
                     ],
                 ],
-                function ($router) {
+                function($router) {
                     $router->group(
                         [
                             'middleware' => $this->app->environment(
@@ -157,7 +157,7 @@ 
                             ? ['twill_auth:twill_users']
                             : [],
                         ],
-                        function ($router) {
+                        function($router) {
                             require __DIR__ . '/../routes/templates.php';
                         }
                     );
@@ -210,7 +210,7 @@ 
      */
     protected function registerMacros()
     {
-        Route::macro('moduleShowWithPreview', function (
+        Route::macro('moduleShowWithPreview', function(
             $moduleName,
             $routePrefix = null,
             $controllerName = null
@@ -244,7 +244,7 @@ 
                 ->middleware(['web', 'twill_auth:twill_users', 'can:list']);
         });
 
-        Route::macro('module', function (
+        Route::macro('module', function(
             $slug,
             $options = [],
             $resource_options = [],
@@ -255,7 +255,7 @@ 
             $_slug = Arr::last($slugs);
             $className = implode(
                 '',
-                array_map(function ($s) {
+                array_map(function($s) {
                     return ucfirst(Str::singular($s));
                 }, $slugs)
             );
@@ -380,7 +380,7 @@ 
             if ($resource) {
                 Route::group(
                     ['as' => $resourceCustomGroupPrefix],
-                    function () use ($slug, $className, $resource_options) {
+                    function() use ($slug, $className, $resource_options) {
                         Route::resource(
                             $slug,
                             "{$className}Controller",

src/Helpers/i18n_helpers.php

Spacing +3 added lines, -3 removed lines

@@ -16,8 +16,8 @@ 
      */
     function getLocales()
     {
-        $locales = collect(config('translatable.locales'))->map(function ($locale, $index) {
-            return collect($locale)->map(function ($country) use ($locale, $index) {
+        $locales = collect(config('translatable.locales'))->map(function($locale, $index) {
+            return collect($locale)->map(function($country) use ($locale, $index) {
                 return is_numeric($index)
                     ? $locale
                     : "$index-$country";
@@ -42,7 +42,7 @@ 
     {
         $manageMultipleLanguages = count(getLocales()) > 1;
         if ($manageMultipleLanguages && $translate) {
-            $allLanguages = Collection::make(getLocales())->map(function ($locale, $index) use ($form_fields) {
+            $allLanguages = Collection::make(getLocales())->map(function($locale, $index) use ($form_fields) {
                 return [
                     'shortlabel' => strtoupper($locale),
                     'label' => getLanguageLabelFromLocaleCode($locale),

src/Services/Capsules/HasCapsules.php

Indentation +3 added lines, -3 removed lines

@@ -366,9 +366,9 @@
         }
 
         collect($files)->each(function ($file) {
-           if (file_exists($file)) {
-               require_once $file;
-           }
+            if (file_exists($file)) {
+                require_once $file;
+            }
         });
     }
 }

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
 
         return $list
             ->where('enabled', true)
-            ->map(function ($capsule) use ($path) {
+            ->map(function($capsule) use ($path) {
                 return $this->makeCapsule($capsule, $path);
             });
     }
@@ -40,7 +40,7 @@ 
     public function getCapsuleByModule($module)
     {
         return $this->getCapsuleList()
-            ->filter(function ($capsule) use ($module) {
+            ->filter(function($capsule) use ($module) {
                 return Str::lower($capsule['plural']) == Str::lower($module);
             })
             ->first();
@@ -254,7 +254,7 @@ 
     {
         $twillSeeder = app(CapsuleSeeder::class);
 
-        $this->getCapsuleList()->each(function ($capsule) use (
+        $this->getCapsuleList()->each(function($capsule) use (
             $twillSeeder,
             $illuminateSeeder
         ) {
@@ -365,7 +365,7 @@ 
             return;
         }
 
-        collect($files)->each(function ($file) {
+        collect($files)->each(function($file) {
            if (file_exists($file)) {
                require_once $file;
            }