area17 / twill

src/Http/Controllers/Admin/FeaturedController.php

Spacing +12 added lines, -12 removed lines

@@ -42,7 +42,7 @@ 
 
         $featuredSources = $this->getFeaturedSources($request, $featuredSection, $filters['search'] ?? '');
 
-        $contentTypes = Collection::make($featuredSources)->map(function ($source, $sourceKey) {
+        $contentTypes = Collection::make($featuredSources)->map(function($source, $sourceKey) {
             return [
                 'label' => $source['name'],
                 'value' => $sourceKey,
@@ -54,7 +54,7 @@ 
 
             return [
                 'source' => [
-                    'content_type' => Arr::first($contentTypes, function ($contentTypeItem) use ($request) {
+                    'content_type' => Arr::first($contentTypes, function($contentTypeItem) use ($request) {
                         return $contentTypeItem['value'] == $request->get('content_type');
                     }),
                     'items' => $source['items'],
@@ -99,7 +99,7 @@ 
     private function getFeaturedItemsByBucket($featuredSection, $featuredSectionKey)
     {
         $bucketRouteConfig = $this->config->get('twill.bucketsRoutes') ?? [$featuredSectionKey => 'featured'];
-        return Collection::make($featuredSection['buckets'])->map(function ($bucket, $bucketKey) use ($featuredSectionKey, $bucketRouteConfig) {
+        return Collection::make($featuredSection['buckets'])->map(function($bucket, $bucketKey) use ($featuredSectionKey, $bucketRouteConfig) {
             $routePrefix = $bucketRouteConfig[$featuredSectionKey];
             return [
                 'id' => $bucketKey,
@@ -108,7 +108,7 @@ 
                 'acceptedSources' => Collection::make($bucket['bucketables'])->pluck('module'),
                 'withToggleFeatured' => $bucket['with_starred_items'] ?? false,
                 'toggleFeaturedLabels' => $bucket['starred_items_labels'] ?? [],
-                'children' => Feature::where('bucket_key', $bucketKey)->with('featured')->get()->map(function ($feature) {
+                'children' => Feature::where('bucket_key', $bucketKey)->with('featured')->get()->map(function($feature) {
                     if (($item = $feature->featured) != null) {
                         $repository = $this->getRepository($feature->featured_type);
                         $withImage = classHasTrait($repository, HandleMedias::class);
@@ -126,7 +126,7 @@ 
                             'thumbnail' => $item->defaultCmsImage(['w' => 100, 'h' => 100]),
                         ] : []);
                     }
-                })->reject(function ($item) {
+                })->reject(function($item) {
                     return is_null($item);
                 })->values()->toArray(),
             ];
@@ -144,8 +144,8 @@ 
         $fetchedModules = [];
         $featuredSources = [];
 
-        Collection::make($featuredSection['buckets'])->map(function ($bucket, $bucketKey) use (&$fetchedModules, $search, $request) {
-            return Collection::make($bucket['bucketables'])->mapWithKeys(function ($bucketable) use (&$fetchedModules, $bucketKey, $search, $request) {
+        Collection::make($featuredSection['buckets'])->map(function($bucket, $bucketKey) use (&$fetchedModules, $search, $request) {
+            return Collection::make($bucket['bucketables'])->mapWithKeys(function($bucketable) use (&$fetchedModules, $bucketKey, $search, $request) {
 
                 $module = $bucketable['module'];
                 $repository = $this->getRepository($module);
@@ -174,12 +174,12 @@ 
                     'withImage' => $withImage,
                 ]];
             });
-        })->each(function ($bucketables, $bucket) use (&$featuredSources) {
-            $bucketables->each(function ($bucketableData, $bucketable) use ($bucket, &$featuredSources) {
+        })->each(function($bucketables, $bucket) use (&$featuredSources) {
+            $bucketables->each(function($bucketableData, $bucketable) use ($bucket, &$featuredSources) {
                 $featuredSources[$bucketable]['name'] = $bucketableData['name'];
                 $featuredSources[$bucketable]['maxPage'] = $bucketableData['items']->lastPage();
                 $featuredSources[$bucketable]['offset'] = $bucketableData['items']->perPage();
-                $featuredSources[$bucketable]['items'] = $bucketableData['items']->map(function ($item) use ($bucketableData, $bucketable) {
+                $featuredSources[$bucketable]['items'] = $bucketableData['items']->map(function($item) use ($bucketableData, $bucketable) {
                     return [
                         'id' => $item->id,
                         'name' => $item->titleInBucket ?? $item->title,
@@ -208,8 +208,8 @@ 
      */
     public function save(Request $request, DB $db)
     {
-        $db->transaction(function () use ($request) {
-            Collection::make($request->get('buckets'))->each(function ($bucketables, $bucketKey) {
+        $db->transaction(function() use ($request) {
+            Collection::make($request->get('buckets'))->each(function($bucketables, $bucketKey) {
                 Feature::where('bucket_key', $bucketKey)->delete();
                 foreach (($bucketables ?? []) as $position => $bucketable) {
                     Feature::create([

src/Http/Controllers/Admin/ModuleController.php

Spacing +14 added lines, -14 removed lines

@@ -259,7 +259,7 @@ 
             "$this->viewPrefix.index",
             "twill::$this->moduleName.index",
             "twill::layouts.listing",
-        ])->first(function ($view) {
+        ])->first(function($view) {
             return View::exists($view);
         });
 
@@ -339,7 +339,7 @@ 
             "$this->viewPrefix.form",
             "twill::$this->moduleName.form",
             "twill::layouts.form",
-        ])->first(function ($view) {
+        ])->first(function($view) {
             return View::exists($view);
         });
 
@@ -455,7 +455,7 @@ 
             "$this->viewPrefix.form",
             "twill::$this->moduleName.form",
             "twill::layouts.form",
-        ])->first(function ($view) {
+        ])->first(function($view) {
             return View::exists($view);
         });
 
@@ -648,7 +648,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);
     }
@@ -732,8 +732,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();
 
@@ -986,7 +986,7 @@ 
             'feature',
             'bulkFeature',
             'bulkDelete',
-        ])->mapWithKeys(function ($endpoint) use ($moduleName, $routePrefix) {
+        ])->mapWithKeys(function($endpoint) use ($moduleName, $routePrefix) {
             return [
                 $endpoint . 'Url' => $this->getIndexOption($endpoint) ? moduleRoute(
                     $this->moduleName, $this->routePrefix, $endpoint,
@@ -1002,7 +1002,7 @@ 
      */
     protected function getIndexOption($option)
     {
-        return once(function () use ($option) {
+        return once(function() use ($option) {
             $customOptionNamesMapping = [
                 'store' => 'create',
             ];
@@ -1055,8 +1055,8 @@ 
     {
         $withImage = $this->moduleHas('medias');
 
-        return $items->map(function ($item) use ($withImage) {
-            $columnsData = Collection::make($this->browserColumns)->mapWithKeys(function ($column) use ($item, $withImage) {
+        return $items->map(function($item) use ($withImage) {
+            $columnsData = Collection::make($this->browserColumns)->mapWithKeys(function($column) use ($item, $withImage) {
                 return $this->getItemColumnData($item, $column);
             })->toArray();
 
@@ -1122,7 +1122,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 {
@@ -1200,7 +1200,7 @@ 
             'permalinkPrefix' => $this->getPermalinkPrefix($baseUrl),
             'saveUrl' => $this->getModuleRoute($item->id, 'update'),
             'editor' => $this->moduleHas('revisions') && $this->moduleHas('blocks') && !$this->disableEditor,
-            'blockPreviewUrl' => Route::has('admin.blocks.preview')? URL::route('admin.blocks.preview') : '#',
+            'blockPreviewUrl' => Route::has('admin.blocks.preview') ? URL::route('admin.blocks.preview') : '#',
             'revisions' => $this->moduleHas('revisions') ? $item->revisionsArray() : null,
         ] + (Route::has($previewRouteName) ? [
             'previewUrl' => moduleRoute($this->moduleName, $this->routePrefix, 'preview', $item->id),
@@ -1268,11 +1268,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);
         });
 

src/Http/Controllers/Admin/BlocksController.php

Spacing +3 added lines, -3 removed lines

@@ -56,16 +56,16 @@
 
         $blocksCollection->push($newBlock);
 
-        $block['blocks']->each(function ($childBlock) use ($newBlock, $blocksCollection, $blockRepository) {
+        $block['blocks']->each(function($childBlock) use ($newBlock, $blocksCollection, $blockRepository) {
             $childBlock['parent_id'] = $newBlock->id;
             $newChildBlock = $blockRepository->createForPreview($childBlock);
             $blocksCollection->push($newChildBlock);
         });
 
-        $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, [

src/Http/Controllers/Admin/DashboardController.php

Spacing +20 added lines, -20 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']);
 
             $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();
     }
@@ -201,7 +201,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],
@@ -216,7 +216,7 @@ 
             'yesterday',
             'week',
             'month',
-        ])->mapWithKeys(function ($period) use ($statsByDate) {
+        ])->mapWithKeys(function($period) use ($statsByDate) {
             $stats = $this->getPeriodStats($period, $statsByDate);
             return [
                 $period => [
@@ -253,10 +253,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'];
                 }),
             ];
@@ -265,10 +265,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'];
                 }),
             ];
@@ -291,10 +291,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'];
                 }),
             ];
@@ -317,10 +317,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'];
                 }),
             ];
@@ -346,9 +346,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']);
 
             $moduleOptions = [
@@ -385,14 +385,14 @@ 
      */
     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']);
 
             $drafts = $repository->draft()->mine()->limit(3)->latest()->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,

src/Http/Requests/Admin/UserRequest.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
                         'name' => 'required',
                         'role' => 'not_in:SUPERADMIN',
                         'email' => 'required|email|unique:' . config('twill.users_table', 'twill_users') . ',email,' . $this->route('user'),
-                        'verify-code' => function ($attribute, $value, $fail) {
+                        'verify-code' => function($attribute, $value, $fail) {
                             $user = Auth::guard('twill_users')->user();
                             $with2faSettings = config('twill.enabled.users-2fa') && $user->id == $this->route('user');
 

src/Commands/GenerateBlocks.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
         $this->info(self::SCANNING_BLOCKS);
 
-        Collection::make($this->filesystem->files($path))->each(function ($viewFile) {
+        Collection::make($this->filesystem->files($path))->each(function($viewFile) {
             $blockName = $viewFile->getBasename('.blade.php');
 
             $vueBlockTemplate = $this->viewFactory->make('admin.blocks.' . $blockName, ['renderForBlocks' => true])->render();

src/Commands/RefreshLQIP.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
     // TODO: document this and actually think about moving to queuable job after content type updates
     public function handle()
     {
-        $this->db->table('mediables')->orderBy('id')->chunk(100, function ($attached_medias) {
+        $this->db->table('mediables')->orderBy('id')->chunk(100, function($attached_medias) {
             foreach ($attached_medias as $attached_media) {
                 $uuid = Media::withTrashed()->find($attached_media->media_id, ['uuid'])->uuid;
 

src/AuthServiceProvider.php

Spacing +21 added lines, -21 removed lines

@@ -31,72 +31,72 @@
 
     public function boot()
     {
-        Gate::define('list', function ($user) {
-            return $this->authorize($user, function ($user) {
+        Gate::define('list', function($user) {
+            return $this->authorize($user, function($user) {
                 return $this->userHasRole($user, [UserRole::VIEWONLY, UserRole::PUBLISHER, UserRole::ADMIN]);
             });
         });
 
-        Gate::define('edit', function ($user) {
-            return $this->authorize($user, function ($user) {
+        Gate::define('edit', function($user) {
+            return $this->authorize($user, function($user) {
                 return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]);
             });
         });
 
-        Gate::define('reorder', function ($user) {
-            return $this->authorize($user, function ($user) {
+        Gate::define('reorder', function($user) {
+            return $this->authorize($user, function($user) {
                 return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]);
             });
         });
 
-        Gate::define('publish', function ($user) {
-            return $this->authorize($user, function ($user) {
+        Gate::define('publish', function($user) {
+            return $this->authorize($user, function($user) {
                 return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]);
             });
         });
 
-        Gate::define('feature', function ($user) {
-            return $this->authorize($user, function ($user) {
+        Gate::define('feature', function($user) {
+            return $this->authorize($user, function($user) {
                 return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]);
             });
         });
 
-        Gate::define('delete', function ($user) {
-            return $this->authorize($user, function ($user) {
+        Gate::define('delete', function($user) {
+            return $this->authorize($user, function($user) {
                 return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]);
             });
         });
 
-        Gate::define('upload', function ($user) {
-            return $this->authorize($user, function ($user) {
+        Gate::define('upload', function($user) {
+            return $this->authorize($user, function($user) {
                 return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]);
             });
         });
 
-        Gate::define('manage-users', function ($user) {
-            return $this->authorize($user, function ($user) {
+        Gate::define('manage-users', function($user) {
+            return $this->authorize($user, function($user) {
                 return $this->userHasRole($user, [UserRole::ADMIN]);
             });
         });
 
         // As an admin, I can edit users, except superadmins
         // As a non-admin, I can edit myself only
-        Gate::define('edit-user', function ($user, $editedUser = null) {
-            return $this->authorize($user, function ($user) use ($editedUser) {
+        Gate::define('edit-user', function($user, $editedUser = null) {
+            return $this->authorize($user, function($user) use ($editedUser) {
                 $editedUserObject = User::find($editedUser);
                 return ($this->userHasRole($user, [UserRole::ADMIN]) || $user->id == $editedUser)
                     && ($editedUserObject ? $editedUserObject->role !== self::SUPERADMIN : true);
             });
         });
 
-        Gate::define('publish-user', function ($user) {
-            return $this->authorize($user, function ($user) {
+        Gate::define('publish-user', function($user) {
+            return $this->authorize($user, function($user) {
                 $editedUserObject = User::find(request('id'));
                 return $this->userHasRole($user, [UserRole::ADMIN]) && ($editedUserObject ? $user->id !== $editedUserObject->id && $editedUserObject->role !== self::SUPERADMIN : false);
             });
         });
 
-        Gate::define('impersonate', function ($user) {
+        Gate::define('impersonate', function($user) {
             return $user->role === self::SUPERADMIN;
         });
 

src/Repositories/SettingRepository.php

Spacing +5 added lines, -5 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,15 +45,15 @@ 
      */
     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();
 
-        $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) {
@@ -101,7 +101,7 @@ 
             $this->updateOrCreate($section + ['key' => $role], $section + [
                 'key' => $role,
                 'medias' => [
-                    $role => Collection::make($settingsFields['medias'][$role])->map(function ($media) {
+                    $role => Collection::make($settingsFields['medias'][$role])->map(function($media) {
                         return json_decode($media, true);
                     })->values()->filter()->toArray(),
                 ],