area17 / twill

src/Repositories/SettingRepository.php

Spacing +8 added lines, -8 removed lines

@@ -34,7 +34,7 @@ 
      */
     public function byKey($key, $section = null)
     {
-        $settingQuery = $this->model->when($section, function ($query) use ($section) {
+        $settingQuery = $this->model->when($section, function($query) use ($section) {
             $query->where('section', $section);
         })->where('key', $key);
 
@@ -51,13 +51,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]))
                     {
@@ -67,12 +67,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) {
@@ -123,13 +123,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/Repositories/Behaviors/HandleTranslations.php

Spacing +4 added lines, -4 removed lines

@@ -32,12 +32,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;
                 }));
 
@@ -47,7 +47,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,
@@ -106,7 +106,7 @@ 
     {
         if ($this->model->isTranslatable()) {
             $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, $this->getLikeOperator(), '%' . $scopes[$attribute] . '%');

src/Models/Behaviors/HasMedias.php

Spacing +14 added lines, -14 removed lines

@@ -19,7 +19,7 @@ 
 
     public static function bootHasMedias(): void
     {
-        self::deleted(static function (Model $model) {
+        self::deleted(static function(Model $model) {
             if (!method_exists($model, 'isForceDeleting') || $model->isForceDeleting()) {
                 /** @var \A17\Twill\Models\Behaviors\HasMedias $model */
                 $model->medias()->detach();
@@ -55,7 +55,7 @@ 
     private function findMedia($role, $crop = "default")
     {
         $foundMedia = false;
-        $media = $this->medias->first(function ($media) use ($role, $crop, &$foundMedia) {
+        $media = $this->medias->first(function($media) use ($role, $crop, &$foundMedia) {
             if (config('twill.media_library.translated_form_fields', false)) {
                 $localeScope = $media->pivot->locale === app()->getLocale();
             }
@@ -68,7 +68,7 @@ 
         });
 
         if (!$media && config('twill.media_library.translated_form_fields', false)) {
-            $media = $this->medias->first(function ($media) use ($role, $crop, &$foundMedia) {
+            $media = $this->medias->first(function($media) use ($role, $crop, &$foundMedia) {
                 if (!$foundMedia) {
                     $foundMedia = $media->pivot->role === $role;
                 }
@@ -146,7 +146,7 @@ 
      */
     public function images($role, $crop = "default", $params = [])
     {
-        $medias = $this->medias->filter(function ($media) use ($role, $crop) {
+        $medias = $this->medias->filter(function($media) use ($role, $crop) {
             return $media->pivot->role === $role && $media->pivot->crop === $crop;
         });
 
@@ -168,7 +168,7 @@ 
      */
     public function imagesWithCrops($role, $params = [])
     {
-        $medias = $this->medias->filter(function ($media) use ($role) {
+        $medias = $this->medias->filter(function($media) use ($role) {
             return $media->pivot->role === $role;
         });
 
@@ -221,7 +221,7 @@ 
      */
     public function imagesAsArrays($role, $crop = "default", $params = [])
     {
-        $medias = $this->medias->filter(function ($media) use ($role, $crop) {
+        $medias = $this->medias->filter(function($media) use ($role, $crop) {
             return $media->pivot->role === $role && $media->pivot->crop === $crop;
         });
 
@@ -243,7 +243,7 @@ 
      */
     public function imagesAsArraysWithCrops($role, $params = [])
     {
-        $medias = $this->medias->filter(function ($media) use ($role) {
+        $medias = $this->medias->filter(function($media) use ($role) {
             return $media->pivot->role === $role;
         });
 
@@ -267,12 +267,12 @@ 
     public function imageAltText($role, $media = null)
     {
         if (!$media) {
-            $media = $this->medias->first(function ($media) use ($role) {
+            $media = $this->medias->first(function($media) use ($role) {
                 if (config('twill.media_library.translated_form_fields', false)) {
                     $localeScope = $media->pivot->locale === app()->getLocale();
                 }
 
-                return $media->pivot->role === $role && ($localeScope ?? true);;
+                return $media->pivot->role === $role && ($localeScope ?? true); ;
             });
         }
 
@@ -293,12 +293,12 @@ 
     public function imageCaption($role, $media = null)
     {
         if (!$media) {
-            $media = $this->medias->first(function ($media) use ($role) {
+            $media = $this->medias->first(function($media) use ($role) {
                 if (config('twill.media_library.translated_form_fields', false)) {
                     $localeScope = $media->pivot->locale === app()->getLocale();
                 }
 
-                return $media->pivot->role === $role && ($localeScope ?? true);;
+                return $media->pivot->role === $role && ($localeScope ?? true); ;
             });
         }
 
@@ -319,12 +319,12 @@ 
     public function imageVideo($role, $media = null)
     {
         if (!$media) {
-            $media = $this->medias->first(function ($media) use ($role) {
+            $media = $this->medias->first(function($media) use ($role) {
                 if (config('twill.media_library.translated_form_fields', false)) {
                     $localeScope = $media->pivot->locale === app()->getLocale();
                 }
 
-                return $media->pivot->role === $role && ($localeScope ?? true);;
+                return $media->pivot->role === $role && ($localeScope ?? true); ;
             });
         }
 
@@ -441,7 +441,7 @@ 
      */
     public function imageObjects($role, $crop = "default")
     {
-        return $this->medias->filter(function ($media) use ($role, $crop) {
+        return $this->medias->filter(function($media) use ($role, $crop) {
             return $media->pivot->role === $role && $media->pivot->crop === $crop;
         });
     }

src/Http/Requests/Admin/Request.php

Spacing +7 added lines, -7 removed lines

@@ -26,8 +26,8 @@ 
     public function rules()
     {
         switch ($this->method()) {
-            case 'POST':{return $this->rulesForCreate();}
-            case 'PUT':{return $this->rulesForUpdate();}
+            case 'POST':{return $this->rulesForCreate(); }
+            case 'PUT':{return $this->rulesForUpdate(); }
             default:break;
         }
 
@@ -56,7 +56,7 @@ 
             }
         }
 
-        if (! $localeActive) {
+        if (!$localeActive) {
             $rules = $this->updateRules($rules, $fields, reset($locales));
         }
 
@@ -82,12 +82,12 @@ 
             $fieldRules = Collection::make($fieldRules);
 
             // Remove required rules, when locale is not active
-            if (! $localeActive) {
-                $hasRequiredRule = $fieldRules->contains(function ($rule) {
+            if (!$localeActive) {
+                $hasRequiredRule = $fieldRules->contains(function($rule) {
                     return $this->ruleStartsWith($rule, 'required');
                 });
 
-                $fieldRules = $fieldRules->reject(function ($rule) {
+                $fieldRules = $fieldRules->reject(function($rule) {
                     return $this->ruleStartsWith($rule, 'required');
                 });
 
@@ -96,7 +96,7 @@ 
                 }
             }
 
-            $rules["{$field}.{$locale}"] = $fieldRules->map(function ($rule) use ($locale, $fieldNames) {
+            $rules["{$field}.{$locale}"] = $fieldRules->map(function($rule) use ($locale, $fieldNames) {
                 // allows using validation rule that references other fields even for translated fields
                 if ($this->ruleStartsWith($rule, 'required_') && Str::contains($rule, $fieldNames)) {
                     foreach ($fieldNames as $fieldName) {

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, $index) {
+        return $this->revisions->map(function($revision, $index) {
             return [
                 'id' => $revision->id,
                 'author' => $revision->user->name ?? 'Unknown',

src/Models/Behaviors/HasTranslation.php

Spacing +10 added lines, -10 removed lines

@@ -36,7 +36,7 @@ 
         if (method_exists($query->getModel(), 'translations')) {
             $locale = $locale == null ? app()->getLocale() : $locale;
 
-            $query->whereHas('translations', function ($query) use ($locale) {
+            $query->whereHas('translations', function($query) use ($locale) {
                 $query->whereActive(true);
                 $query->whereLocale($locale);
 
@@ -45,7 +45,7 @@ 
                 }
             });
 
-            return $query->with(['translations' => function ($query) use ($locale) {
+            return $query->with(['translations' => function($query) use ($locale) {
                 $query->whereActive(true);
                 $query->whereLocale($locale);
 
@@ -72,14 +72,14 @@ 
         $locale = $locale == null ? app()->getLocale() : $locale;
 
         return $query
-            ->join($translationTable, function (JoinClause $join) use ($translationTable, $localeKey, $table, $keyName) {
+            ->join($translationTable, function(JoinClause $join) use ($translationTable, $localeKey, $table, $keyName) {
                 $join
-                    ->on($translationTable.'.'.$this->getRelationKey(), '=', $table.'.'.$keyName)
-                    ->where($translationTable.'.'.$localeKey, $this->locale());
+                    ->on($translationTable . '.' . $this->getRelationKey(), '=', $table . '.' . $keyName)
+                    ->where($translationTable . '.' . $localeKey, $this->locale());
             })
-            ->where($translationTable.'.'.$this->getLocaleKey(), $locale)
-            ->orderBy($translationTable.'.'.$orderField, $orderType)
-            ->select($table.'.*')
+            ->where($translationTable . '.' . $this->getLocaleKey(), $locale)
+            ->orderBy($translationTable . '.' . $orderField, $orderType)
+            ->select($table . '.*')
             ->with('translations');
     }
 
@@ -131,7 +131,7 @@ 
      */
     public function getActiveLanguages()
     {
-        return Collection::make(getLocales())->map(function ($locale) {
+        return Collection::make(getLocales())->map(function($locale) {
             $translation = $this->translations->firstWhere('locale', $locale);
 
             return [
@@ -151,7 +151,7 @@ 
      */
     public function translatedAttribute($key)
     {
-        return $this->translations->mapWithKeys(function ($translation) use ($key) {
+        return $this->translations->mapWithKeys(function($translation) use ($key) {
             return [$translation->locale => $this->translate($translation->locale)->$key];
         });
     }

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'], $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) {
@@ -149,7 +149,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();
     }
@@ -159,7 +159,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();
     }
@@ -212,7 +212,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],
@@ -249,7 +249,7 @@ 
             'yesterday',
             'week',
             'month',
-        ])->mapWithKeys(function ($period) use ($statsByDate, $dummyData) {
+        ])->mapWithKeys(function($period) use ($statsByDate, $dummyData) {
 
             if ($dummyData) {
                 return [$period => $dummyData];
@@ -291,10 +291,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'];
                 }),
             ];
@@ -303,10 +303,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'];
                 }),
             ];
@@ -329,10 +329,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'];
                 }),
             ];
@@ -355,10 +355,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'];
                 }),
             ];
@@ -384,9 +384,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 = [
@@ -424,9 +424,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();
@@ -437,7 +437,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,