area17 / twill

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/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(),
                 ],

src/Repositories/UserRepository.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
      */
     public function filter($query, array $scopes = [])
     {
-        $query->when(isset($scopes['role']), function ($query) use ($scopes) {
+        $query->when(isset($scopes['role']), function($query) use ($scopes) {
             $query->where('role', $scopes['role']);
         });
         $query->where('role', '<>', 'SUPERADMIN');

src/Repositories/Behaviors/HandleTranslations.php

Spacing +4 added lines, -4 removed lines

@@ -23,12 +23,12 @@ 
 
             $submittedLanguages = Collection::make($fields['languages'] ?? []);
 
-            $atLeastOneLanguageIsPublished = $submittedLanguages->contains(function ($language) {
+            $atLeastOneLanguageIsPublished = $submittedLanguages->contains(function($language) {
                 return $language['published'];
             });
 
             foreach ($locales as $index => $locale) {
-                $submittedLanguage = Arr::first($submittedLanguages->filter(function ($lang) use ($locale) {
+                $submittedLanguage = Arr::first($submittedLanguages->filter(function($lang) use ($locale) {
                     return $lang['value'] == $locale;
                 }));
 
@@ -38,7 +38,7 @@ 
 
                 $fields[$locale] = [
                     'active' => $activeField,
-                ] + $attributes->mapWithKeys(function ($attribute) use (&$fields, $locale, $localesCount, $index) {
+                ] + $attributes->mapWithKeys(function($attribute) use (&$fields, $locale, $localesCount, $index) {
                     $attributeValue = $fields[$attribute] ?? null;
 
                     // if we are at the last locale,
@@ -79,7 +79,7 @@ 
     {
         if (property_exists($this->model, 'translatedAttributes')) {
             $attributes = $this->model->translatedAttributes;
-            $query->whereHas('translations', function ($q) use ($scopes, $attributes) {
+            $query->whereHas('translations', function($q) use ($scopes, $attributes) {
                 foreach ($attributes as $attribute) {
                     if (isset($scopes[$attribute]) && is_string($scopes[$attribute])) {
                         $q->where($attribute, 'like', '%' . $scopes[$attribute] . '%');

src/Repositories/Behaviors/HandleSlugs.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
         }
 
         if (!$item && config('translatable.use_property_fallback', false)) {
-            $item = (clone $query)->orWhere(function ($query) {
+            $item = (clone $query)->orWhere(function($query) {
                 return $query->withActiveTranslations(config('translatable.fallback_locale'));
             })->forFallbackLocaleSlug($slug)->first();