area17 / twill

src/RouteServiceProvider.php

Spacing +13 added lines, -13 removed lines

@@ -70,11 +70,11 @@ 
     private function mapHostRoutes($router, $groupOptions, $middlewares, $supportSubdomainRouting)
     {
         if (file_exists(base_path('routes/admin.php'))) {
-            $hostRoutes = function ($router) use ($middlewares) {
+            $hostRoutes = function($router) use ($middlewares) {
                 $router->group([
                     'namespace' => config('twill.namespace', 'App') . '\Http\Controllers\Admin',
                     'middleware' => $middlewares,
-                ], function ($router) {
+                ], function($router) {
                     require base_path('routes/admin.php');
                 });
             };
@@ -93,25 +93,25 @@ 
 
     private function mapInternalRoutes($router, $groupOptions, $middlewares, $supportSubdomainRouting)
     {
-        $internalRoutes = function ($router) use ($middlewares, $supportSubdomainRouting) {
-            $router->group(['middleware' => $middlewares], function ($router) {
+        $internalRoutes = function($router) use ($middlewares, $supportSubdomainRouting) {
+            $router->group(['middleware' => $middlewares], function($router) {
                 require __DIR__ . '/../routes/admin.php';
             });
 
             $router->group([
                 'middleware' => $supportSubdomainRouting ? ['supportSubdomainRouting'] : [],
-            ], function ($router) {
+            ], function($router) {
                 require __DIR__ . '/../routes/auth.php';
             });
 
-            $router->group(['middleware' => $this->app->environment('production') ? ['twill_auth:twill_users'] : []], function ($router) {
+            $router->group(['middleware' => $this->app->environment('production') ? ['twill_auth:twill_users'] : []], function($router) {
                 require __DIR__ . '/../routes/templates.php';
             });
         };
 
         $router->group($groupOptions + [
             'namespace' => $this->namespace . '\Admin',
-        ], function ($router) use ($internalRoutes, $supportSubdomainRouting) {
+        ], function($router) use ($internalRoutes, $supportSubdomainRouting) {
             $router->group([
                 'domain' => config('twill.admin_app_url'),
             ], $internalRoutes);
@@ -129,8 +129,8 @@ 
                 'domain' => config('app.url'),
                 'middleware' => [config('twill.admin_middleware_group', 'web')],
             ],
-                function ($router) {
-                    $router->group(['middleware' => $this->app->environment('production') ? ['twill_auth:twill_users'] : []], function ($router) {
+                function($router) {
+                    $router->group(['middleware' => $this->app->environment('production') ? ['twill_auth:twill_users'] : []], function($router) {
                         require __DIR__ . '/../routes/templates.php';
                     });
                 }
@@ -165,7 +165,7 @@ 
      */
     protected function registerMacros()
     {
-        Route::macro('moduleShowWithPreview', function ($moduleName, $routePrefix = null, $controllerName = null) {
+        Route::macro('moduleShowWithPreview', function($moduleName, $routePrefix = null, $controllerName = null) {
             if ($routePrefix === null) {
                 $routePrefix = $moduleName;
             }
@@ -181,12 +181,12 @@ 
             Route::name($moduleName . '.preview')->get('/admin-preview' . $routePrefix . '{slug}', $controllerName . 'Controller@show')->middleware(['web', 'twill_auth:twill_users', 'can:list']);
         });
 
-        Route::macro('module', function ($slug, $options = [], $resource_options = [], $resource = true) {
+        Route::macro('module', function($slug, $options = [], $resource_options = [], $resource = true) {
 
             $slugs = explode('.', $slug);
             $prefixSlug = str_replace('.', "/", $slug);
             $_slug = Arr::last($slugs);
-            $className = implode("", array_map(function ($s) {
+            $className = implode("", array_map(function($s) {
                 return ucfirst(Str::singular($s));
             }, $slugs));
 
@@ -257,7 +257,7 @@ 
             }
 
             if ($resource) {
-                Route::group(['as' => $resourceCustomGroupPrefix], function () use ($slug, $className, $resource_options) {
+                Route::group(['as' => $resourceCustomGroupPrefix], function() use ($slug, $className, $resource_options) {
                     Route::resource($slug, "{$className}Controller", $resource_options);
                 });
             }

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/Repositories/SettingRepository.php

Spacing +8 added lines, -8 removed lines

@@ -34,7 +34,7 @@ 
      */
     public function byKey($key, $section = null)
     {
-        return $this->model->when($section, function ($query) use ($section) {
+        return $this->model->when($section, function($query) use ($section) {
             $query->where('section', $section);
         })->where('key', $key)->exists() ? $this->model->where('key', $key)->with('translations')->first()->value : null;
     }
@@ -45,13 +45,13 @@ 
      */
     public function getFormFields($section = null)
     {
-        $settings = $this->model->when($section, function ($query) use ($section) {
+        $settings = $this->model->when($section, function($query) use ($section) {
             $query->where('section', $section);
         })->with('translations', 'medias')->get();
 
 
         if (config('twill.media_library.translated_form_fields', false)) {
-            $medias = $settings->reduce(function ($carry, $setting) {
+            $medias = $settings->reduce(function($carry, $setting) {
                 foreach (getLocales() as $locale) {
                     if (!empty(parent::getFormFields($setting)['medias'][$locale]) && !empty(parent::getFormFields($setting)['medias'][$locale][$setting->key]))
                     {
@@ -61,12 +61,12 @@ 
                 return $carry;
             });
         } else {
-            $medias = $settings->mapWithKeys(function ($setting) {
+            $medias = $settings->mapWithKeys(function($setting) {
                 return [$setting->key => parent::getFormFields($setting)['medias'][$setting->key] ?? null];
             })->filter()->toArray();
         }
 
-        return $settings->mapWithKeys(function ($setting) {
+        return $settings->mapWithKeys(function($setting) {
             $settingValue = [];
 
             foreach ($setting->translations as $translation) {
@@ -117,13 +117,13 @@ 
 
             if (config('twill.media_library.translated_form_fields', false)) {
                 foreach (getLocales() as $locale) {
-                    $medias["{$role}[{$locale}]"] = Collection::make($settingsFields['medias'][$role][$locale])->map(function ($media) {
+                    $medias["{$role}[{$locale}]"] = Collection::make($settingsFields['medias'][$role][$locale])->map(function($media) {
                         return json_decode($media, true);
                     })->filter()->toArray();
                 }
             } else {
-                $medias =  [
-                    $role => Collection::make($settingsFields['medias'][$role])->mapWithKeys(function ($media, $key) {
+                $medias = [
+                    $role => Collection::make($settingsFields['medias'][$role])->mapWithKeys(function($media, $key) {
                         return json_decode($media, true);
                     })->values()->filter()->toArray(),
                 ];

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/Services/Blocks/BlockCollection.php

Spacing +13 added lines, -13 removed lines

@@ -50,12 +50,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();
@@ -67,7 +67,7 @@ 
     public function getBlocks()
     {
         return $this->collect()
-            ->filter(function ($block) {
+            ->filter(function($block) {
                 return $block->type === Block::TYPE_BLOCK;
             })
             ->values();
@@ -78,7 +78,7 @@ 
      */
     public function getBlockList()
     {
-        return $this->getBlocks()->map(function (Block $block) {
+        return $this->getBlocks()->map(function(Block $block) {
             return $block->toList();
         });
     }
@@ -105,7 +105,7 @@ 
             return collect();
         }
 
-        return collect($this->fileSystem->files($directory))->map(function (
+        return collect($this->fileSystem->files($directory))->map(function(
             $file
         ) use ($source, $type) {
             return new Block($file, $type, $source);
@@ -120,7 +120,7 @@ 
         $this->paths = collect(
             config('twill.block_editor.directories.source.blocks')
         )
-            ->map(function ($path) {
+            ->map(function($path) {
                 $path['type'] = Block::TYPE_BLOCK;
 
                 return $path;
@@ -128,7 +128,7 @@ 
             ->merge(
                 collect(
                     config('twill.block_editor.directories.source.repeaters')
-                )->map(function ($path) {
+                )->map(function($path) {
                     $path['type'] = Block::TYPE_REPEATER;
 
                     return $path;
@@ -166,12 +166,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;
@@ -182,7 +182,7 @@ 
             ->toArray();
 
         $this->items = $this->collect()
-            ->each(function (Block $block) {
+            ->each(function(Block $block) {
                 $block->setSource($this->detectCustomSources($block));
             })
             ->toArray();
@@ -203,7 +203,7 @@ 
      */
     public function list()
     {
-        return $this->collect()->map(function (Block $block) {
+        return $this->collect()->map(function(Block $block) {
             return $block->toList();
         });
     }
@@ -222,7 +222,7 @@ 
     public function getRepeaters()
     {
         return $this->collect()
-            ->filter(function ($block) {
+            ->filter(function($block) {
                 return $block->type === Block::TYPE_REPEATER;
             })
             ->values();
@@ -233,7 +233,7 @@ 
      */
     public function getRepeaterList()
     {
-        return $this->getRepeaters()->map(function (Block $block) {
+        return $this->getRepeaters()->map(function(Block $block) {
             return $block->toList();
         });
     }

src/Commands/ModuleMakeDeprecated.php

Spacing +1 added lines, -1 removed lines

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

src/Models/Media.php

Spacing +5 added lines, -5 removed lines

@@ -22,18 +22,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();
@@ -69,7 +69,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,
@@ -81,7 +81,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']},
                     ];

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/Helpers/helpers.php

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,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())));
     }
@@ -201,12 +201,12 @@ 
     {
         $blockList = app(BlockCollection::class)->getBlockList();
 
-        $appBlocksList = $blockList->filter(function ($block) {
+        $appBlocksList = $blockList->filter(function($block) {
             return $block['source'] !== A17\Twill\Services\Blocks\Block::SOURCE_TWILL;
         });
 
         return $blockList->filter(
-            function ($block) use ($blocks, $groups, $appBlocksList) {
+            function($block) use ($blocks, $groups, $appBlocksList) {
                 if ($block['group'] === A17\Twill\Services\Blocks\Block::SOURCE_TWILL) {
                     if (!collect(
                         config('twill.block_editor.use_twill_blocks')
@@ -215,7 +215,7 @@ 
                     }
 
                     if (count($appBlocksList) > 0 && $appBlocksList->contains(
-                        function ($appBlock) use ($block) {
+                        function($appBlock) use ($block) {
                             return $appBlock['name'] === $block['name'];
                         })
                     ) {