area17 / twill

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());
     }

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/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/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/Models/Behaviors/HasRevisions.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function scopeMine($query)
     {
-        return $query->whereHas('revisions', function ($query) {
+        return $query->whereHas('revisions', function($query) {
             $query->where('user_id', auth('twill_users')->user()->id);
         });
     }
@@ -34,7 +34,7 @@ 
      */
     public function revisionsArray()
     {
-        return $this->revisions->map(function ($revision) {
+        return $this->revisions->map(function($revision) {
             return [
                 'id' => $revision->id,
                 'author' => $revision->user->name ?? 'Unknown',

src/Models/Behaviors/HasSlug.php

Spacing +9 added lines, -9 removed lines

@@ -11,15 +11,15 @@ 
 
     protected static function bootHasSlug()
     {
-        static::created(function ($model) {
+        static::created(function($model) {
             $model->setSlugs();
         });
 
-        static::updated(function ($model) {
+        static::updated(function($model) {
             $model->setSlugs();
         });
 
-        static::restored(function ($model) {
+        static::restored(function($model) {
             $model->setSlugs($restoring = true);
         });
     }
@@ -72,7 +72,7 @@ 
      */
     public function scopeForSlug($query, $slug)
     {
-        return $query->whereHas('slugs', function ($query) use ($slug) {
+        return $query->whereHas('slugs', function($query) use ($slug) {
             $query->whereSlug($slug);
             $query->whereActive(true);
             $query->whereLocale(app()->getLocale());
@@ -86,7 +86,7 @@ 
      */
     public function scopeForInactiveSlug($query, $slug)
     {
-        return $query->whereHas('slugs', function ($query) use ($slug) {
+        return $query->whereHas('slugs', function($query) use ($slug) {
             $query->whereSlug($slug);
             $query->whereLocale(app()->getLocale());
         })->with(['slugs']);
@@ -99,7 +99,7 @@ 
      */
     public function scopeForFallbackLocaleSlug($query, $slug)
     {
-        return $query->whereHas('slugs', function ($query) use ($slug) {
+        return $query->whereHas('slugs', function($query) use ($slug) {
             $query->whereSlug($slug);
             $query->whereActive(true);
             $query->whereLocale(config('translatable.fallback_locale'));
@@ -155,7 +155,7 @@ 
         foreach ($slugParams as $key => $value) {
             //check variations of the slug
             if ($key == 'slug') {
-                $query->where(function ($query) use ($value) {
+                $query->where(function($query) use ($value) {
                     $query->orWhere('slug', $value);
                     $query->orWhere('slug', $value . '-' . $this->getSuffixSlug());
                     for ($i = 2; $i <= $this->nb_variation_slug; $i++) {
@@ -235,7 +235,7 @@ 
      */
     public function getActiveSlug($locale = null)
     {
-        return $this->slugs->first(function ($slug) use ($locale) {
+        return $this->slugs->first(function($slug) use ($locale) {
             return ($slug->locale === ($locale ?? app()->getLocale())) && $slug->active;
         }) ?? null;
     }
@@ -247,7 +247,7 @@ 
      */
     public function getFallbackActiveSlug()
     {
-        return $this->slugs->first(function ($slug) {
+        return $this->slugs->first(function($slug) {
             return $slug->locale === config('translatable.fallback_locale') && $slug->active;
         }) ?? null;
     }