area17 / twill

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

src/Repositories/Behaviors/HandleRepeaters.php

Spacing +6 added lines, -6 removed lines

@@ -63,7 +63,7 @@ 
         $relationRepository = $this->getModelRepository($relation, $model);
 
         if (!$keepExisting) {
-            $object->$relation()->each(function ($repeaterElement) {
+            $object->$relation()->each(function($repeaterElement) {
                 $repeaterElement->forceDelete();
             });
         }
@@ -236,8 +236,8 @@ 
 
             if (isset($relatedItemFormFields['medias'])) {
                 if (config('twill.media_library.translated_form_fields', false)) {
-                    Collection::make($relatedItemFormFields['medias'])->each(function ($rolesWithMedias, $locale) use (&$repeatersMedias, $relation, $relationItem) {
-                        $repeatersMedias[] = Collection::make($rolesWithMedias)->mapWithKeys(function ($medias, $role) use ($locale, $relation, $relationItem) {
+                    Collection::make($relatedItemFormFields['medias'])->each(function($rolesWithMedias, $locale) use (&$repeatersMedias, $relation, $relationItem) {
+                        $repeatersMedias[] = Collection::make($rolesWithMedias)->mapWithKeys(function($medias, $role) use ($locale, $relation, $relationItem) {
                             return [
                                 "blocks[$relation-$relationItem->id][$role][$locale]" => $medias,
                             ];
@@ -251,8 +251,8 @@ 
             }
 
             if (isset($relatedItemFormFields['files'])) {
-                Collection::make($relatedItemFormFields['files'])->each(function ($rolesWithFiles, $locale) use (&$repeatersFiles, $relation, $relationItem) {
-                    $repeatersFiles[] = Collection::make($rolesWithFiles)->mapWithKeys(function ($files, $role) use ($locale, $relation, $relationItem) {
+                Collection::make($relatedItemFormFields['files'])->each(function($rolesWithFiles, $locale) use (&$repeatersFiles, $relation, $relationItem) {
+                    $repeatersFiles[] = Collection::make($rolesWithFiles)->mapWithKeys(function($files, $role) use ($locale, $relation, $relationItem) {
                         return [
                             "blocks[$relation-$relationItem->id][$role][$locale]" => $files,
                         ];
@@ -302,7 +302,7 @@ 
      */
     protected function getRepeaters()
     {
-        return collect($this->repeaters)->map(function ($repeater, $key) {
+        return collect($this->repeaters)->map(function($repeater, $key) {
             $repeaterName = is_string($repeater) ? $repeater : $key;
             return [
                 'relation' => !empty($repeater['relation']) ? $repeater['relation'] : $this->inferRelationFromRepeaterName($repeaterName),

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])->map(function ($media) {
+                $medias = [
+                    $role => Collection::make($settingsFields['medias'][$role])->map(function($media) {
                         return json_decode($media, true);
                     })->values()->filter()->toArray(),
                 ];

src/Models/Media.php

Spacing +7 added lines, -7 removed lines

@@ -23,18 +23,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();
@@ -75,7 +75,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,
@@ -87,7 +87,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']},
                     ];
@@ -142,7 +142,7 @@ 
 
         if ($this->update($fields) && $this->isReferenced())
         {
-            DB::table(config('twill.mediables_table', 'twill_mediables'))->where('media_id', $this->id)->get()->each(function ($mediable) use ($prevWidth, $prevHeight) {
+            DB::table(config('twill.mediables_table', 'twill_mediables'))->where('media_id', $this->id)->get()->each(function($mediable) use ($prevWidth, $prevHeight) {
                 
                 if ($prevWidth != $this->width) {
                     $mediable->crop_x = 0;
@@ -154,7 +154,7 @@ 
                     $mediable->crop_h = $this->height;
                 }
 
-                DB::table(config('twill.mediables_table', 'twill_mediables'))->where('id', $mediable->id)->update((array)$mediable);
+                DB::table(config('twill.mediables_table', 'twill_mediables'))->where('id', $mediable->id)->update((array) $mediable);
             });
         }
     }

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;
         });
 
         $finalBlockList = $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'];
                         })
                     ) {

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

Spacing +9 added lines, -9 removed lines

@@ -134,13 +134,13 @@ 
         }
 
         if (config('twill.enabled.media-library')) {
-            $this->app->singleton('imageService', function () {
+            $this->app->singleton('imageService', function() {
                 return $this->app->make(config('twill.media_library.image_service'));
             });
         }
 
         if (config('twill.enabled.file-library')) {
-            $this->app->singleton('fileService', function () {
+            $this->app->singleton('fileService', function() {
                 return $this->app->make(config('twill.file_library.file_service'));
             });
         }
@@ -346,20 +346,20 @@ 
     {
         $blade = $this->app['view']->getEngineResolver()->resolve('blade')->getCompiler();
 
-        $blade->directive('dd', function ($param) {
+        $blade->directive('dd', function($param) {
             return "<?php dd({$param}); ?>";
         });
 
-        $blade->directive('dumpData', function ($data) {
+        $blade->directive('dumpData', function($data) {
             return sprintf("<?php (new Symfony\Component\VarDumper\VarDumper)->dump(%s); exit; ?>",
                 null != $data ? $data : "get_defined_vars()");
         });
 
-        $blade->directive('formField', function ($expression) {
+        $blade->directive('formField', function($expression) {
             return $this->includeView('partials.form._', $expression);
         });
 
-        $blade->directive('partialView', function ($expression) {
+        $blade->directive('partialView', function($expression) {
 
             $expressionAsArray = str_getcsv($expression, ',', '\'');
 
@@ -395,13 +395,13 @@ 
             ?>";
         });
 
-        $blade->directive('pushonce', function ($expression) {
+        $blade->directive('pushonce', function($expression) {
             [$pushName, $pushSub] = explode(':', trim(substr($expression, 1, -1)));
             $key = '__pushonce_' . $pushName . '_' . str_replace('-', '_', $pushSub);
             return "<?php if(! isset(\$__env->{$key})): \$__env->{$key} = 1; \$__env->startPush('{$pushName}'); ?>";
         });
 
-        $blade->directive('endpushonce', function () {
+        $blade->directive('endpushonce', function() {
             return '<?php $__env->stopPush(); endif; ?>';
         });
 
@@ -442,7 +442,7 @@ 
 
         View::composer('twill::partials.navigation.*', ActiveNavigation::class);
 
-        View::composer(['admin.*', 'templates.*', 'twill::*'], function ($view) {
+        View::composer(['admin.*', 'templates.*', 'twill::*'], function($view) {
             $with = array_merge([
                 'renderForBlocks' => false,
                 'renderForModal' => false,

src/Http/Controllers/Admin/DashboardController.php

Spacing +21 added lines, -21 removed lines

@@ -108,14 +108,14 @@ 
     {
         $modules = Collection::make($this->config->get('twill.dashboard.modules'));
 
-        return $modules->filter(function ($module) {
+        return $modules->filter(function($module) {
             return ($module['search'] ?? false);
-        })->map(function ($module) use ($request) {
+        })->map(function($module) use ($request) {
             $repository = $this->getRepository($module['name'], $module['repository'] ?? null);
 
             $found = $repository->cmsSearch($request->get('search'), $module['search_fields'] ?? ['title'])->take(10);
 
-            return $found->map(function ($item) use ($module) {
+            return $found->map(function($item) use ($module) {
                 try {
                     $author = $item->revisions()->latest()->first()->user->name ?? 'Admin';
                 } catch (\Exception $e) {
@@ -142,7 +142,7 @@ 
      */
     private function getAllActivities()
     {
-        return Activity::take(20)->latest()->get()->map(function ($activity) {
+        return Activity::take(20)->latest()->get()->map(function($activity) {
             return $this->formatActivity($activity);
         })->filter()->values();
     }
@@ -152,7 +152,7 @@ 
      */
     private function getLoggedInUserActivities()
     {
-        return Activity::where('causer_id', $this->authFactory->guard('twill_users')->user()->id)->take(20)->latest()->get()->map(function ($activity) {
+        return Activity::where('causer_id', $this->authFactory->guard('twill_users')->user()->id)->take(20)->latest()->get()->map(function($activity) {
             return $this->formatActivity($activity);
         })->filter()->values();
     }
@@ -179,7 +179,7 @@ 
             'date' => $activity->created_at->toIso8601String(),
             'author' => $activity->causer->name ?? twillTrans('twill::lang.dashboard.unkown-author'),
             'name' => $activity->subject->titleInDashboard ?? $activity->subject->title,
-            'activity' => twillTrans('twill::lang.dashboard.activities.'.$activity->description),
+            'activity' => twillTrans('twill::lang.dashboard.activities.' . $activity->description),
         ] + (classHasTrait($activity->subject, HasMedias::class) ? [
             'thumbnail' => $activity->subject->defaultCmsImage(['w' => 100, 'h' => 100]),
         ] : []) + (!$activity->subject->trashed() ? [
@@ -205,7 +205,7 @@ 
             return [];
         }
 
-        $statsByDate = Collection::make($response['rows'] ?? [])->map(function (array $dateRow) {
+        $statsByDate = Collection::make($response['rows'] ?? [])->map(function(array $dateRow) {
             return [
                 'date' => $dateRow[0],
                 'users' => (int) $dateRow[1],
@@ -220,7 +220,7 @@ 
             'yesterday',
             'week',
             'month',
-        ])->mapWithKeys(function ($period) use ($statsByDate) {
+        ])->mapWithKeys(function($period) use ($statsByDate) {
             $stats = $this->getPeriodStats($period, $statsByDate);
             return [
                 $period => [
@@ -257,10 +257,10 @@ 
                 'stats' => $stats = $statsByDate->first(),
                 'moreUsers' => $stats['users'] > $statsByDate->get(1)['users'],
                 'morePageViews' => $stats['pageViews'] > $statsByDate->get(1)['pageViews'],
-                'usersData' => $statsByDate->take(7)->map(function ($stat) {
+                'usersData' => $statsByDate->take(7)->map(function($stat) {
                     return $stat['users'];
                 }),
-                'pageViewsData' => $statsByDate->take(7)->map(function ($stat) {
+                'pageViewsData' => $statsByDate->take(7)->map(function($stat) {
                     return $stat['pageViews'];
                 }),
             ];
@@ -269,10 +269,10 @@ 
                 'stats' => $stats = $statsByDate->get(1),
                 'moreUsers' => $stats['users'] > $statsByDate->get(2)['users'],
                 'morePageViews' => $stats['pageViews'] > $statsByDate->get(2)['pageViews'],
-                'usersData' => $statsByDate->slice(1)->take(7)->map(function ($stat) {
+                'usersData' => $statsByDate->slice(1)->take(7)->map(function($stat) {
                     return $stat['users'];
                 }),
-                'pageViewsData' => $statsByDate->slice(1)->take(7)->map(function ($stat) {
+                'pageViewsData' => $statsByDate->slice(1)->take(7)->map(function($stat) {
                     return $stat['pageViews'];
                 }),
             ];
@@ -295,10 +295,10 @@ 
                 'stats' => $stats,
                 'moreUsers' => $stats['users'] > $compareStats['users'],
                 'morePageViews' => $stats['pageViews'] > $compareStats['pageViews'],
-                'usersData' => $statsByDate->slice(1)->take(29)->map(function ($stat) {
+                'usersData' => $statsByDate->slice(1)->take(29)->map(function($stat) {
                     return $stat['users'];
                 }),
-                'pageViewsData' => $statsByDate->slice(1)->take(29)->map(function ($stat) {
+                'pageViewsData' => $statsByDate->slice(1)->take(29)->map(function($stat) {
                     return $stat['pageViews'];
                 }),
             ];
@@ -321,10 +321,10 @@ 
                 'stats' => $stats,
                 'moreUsers' => $stats['users'] > $compareStats['users'],
                 'morePageViews' => $stats['pageViews'] > $compareStats['pageViews'],
-                'usersData' => $statsByDate->slice(1)->take(29)->map(function ($stat) {
+                'usersData' => $statsByDate->slice(1)->take(29)->map(function($stat) {
                     return $stat['users'];
                 }),
-                'pageViewsData' => $statsByDate->slice(1)->take(29)->map(function ($stat) {
+                'pageViewsData' => $statsByDate->slice(1)->take(29)->map(function($stat) {
                     return $stat['pageViews'];
                 }),
             ];
@@ -350,9 +350,9 @@ 
      */
     private function getShortcuts($modules)
     {
-        return $modules->filter(function ($module) {
+        return $modules->filter(function($module) {
             return ($module['count'] ?? false) || ($module['create'] ?? false);
-        })->map(function ($module) {
+        })->map(function($module) {
             $repository = $this->getRepository($module['name'], $module['repository'] ?? null);
 
             $moduleOptions = [
@@ -389,9 +389,9 @@ 
      */
     private function getDrafts($modules)
     {
-        return $modules->filter(function ($module) {
+        return $modules->filter(function($module) {
             return ($module['draft'] ?? false);
-        })->map(function ($module) {
+        })->map(function($module) {
             $repository = $this->getRepository($module['name'], $module['repository'] ?? null);
 
             $query = $repository->draft()->limit(3)->latest();
@@ -402,7 +402,7 @@ 
 
             $drafts = $query->get();
 
-            return $drafts->map(function ($draft) use ($module) {
+            return $drafts->map(function($draft) use ($module) {
                 return [
                     'type' => ucfirst($module['label_singular'] ?? Str::singular($module['name'])),
                     'name' => $draft->titleInDashboard ?? $draft->title,