area17 / twill

src/Models/Behaviors/HasTranslation.php

Spacing +11 added lines, -11 removed lines

@@ -35,7 +35,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);
 
@@ -44,7 +44,7 @@ 
                 }
             });
 
-            return $query->with(['translations' => function ($query) use ($locale) {
+            return $query->with(['translations' => function($query) use ($locale) {
                 $query->whereActive(true);
                 $query->whereLocale($locale);
 
@@ -71,14 +71,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');
     }
 
@@ -130,14 +130,14 @@ 
      */
     public function getActiveLanguages()
     {
-        return $this->translations->map(function ($translation) {
+        return $this->translations->map(function($translation) {
             return [
                 'shortlabel' => strtoupper($translation->locale),
                 'label' => getLanguageLabelFromLocaleCode($translation->locale),
                 'value' => $translation->locale,
                 'published' => $translation->active ?? false,
             ];
-        })->sortBy(function ($translation) {
+        })->sortBy(function($translation) {
             $localesOrdered = getLocales();
             return array_search($translation['value'], $localesOrdered);
         })->values();
@@ -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/Repositories/Behaviors/HandleBrowsers.php

Spacing +4 added lines, -4 removed lines

@@ -152,7 +152,7 @@ 
         $fields = $this->getRelatedElementsAsCollection($object, $relation);
 
         if ($fields->isNotEmpty()) {
-            return $fields->map(function ($relatedElement) use ($titleKey, $routePrefix, $relation, $moduleName) {
+            return $fields->map(function($relatedElement) use ($titleKey, $routePrefix, $relation, $moduleName) {
                 return [
                     'id' => $relatedElement->id,
                     'name' => $relatedElement->titleInBrowser ?? $relatedElement->$titleKey,
@@ -174,7 +174,7 @@ 
      */
     public function getFormFieldsForRelatedBrowser($object, $relation, $titleKey = 'title')
     {
-        return $object->getRelated($relation)->map(function ($relatedElement) use ($titleKey) {
+        return $object->getRelated($relation)->map(function($relatedElement) use ($titleKey) {
             return ($relatedElement != null) ? [
                 'id' => $relatedElement->id,
                 'name' => $relatedElement->titleInBrowser ?? $relatedElement->$titleKey,
@@ -184,7 +184,7 @@ 
             ]) + (classHasTrait($relatedElement, HasMedias::class) ? [
                 'thumbnail' => $relatedElement->defaultCmsImage(['w' => 100, 'h' => 100]),
             ] : []) : [];
-        })->reject(function ($item) {
+        })->reject(function($item) {
             return empty($item);
         })->values()->toArray();
     }
@@ -197,7 +197,7 @@ 
      */
     protected function getBrowsers()
     {
-        return collect($this->browsers)->map(function ($browser, $key) {
+        return collect($this->browsers)->map(function($browser, $key) {
             $browserName = is_string($browser) ? $browser : $key;
             $moduleName = !empty($browser['moduleName']) ? $browser['moduleName'] : $this->inferModuleNameFromBrowserName($browserName);
 

src/Models/Behaviors/HasBlocks.php

Spacing +3 added lines, -3 removed lines

@@ -19,17 +19,17 @@
     public function renderNamedBlocks($name = 'default', $renderChilds = true, $blockViewMappings = [], $data = [])
     {
         return $this->blocks
-            ->filter(function ($block) use ($name) {
+            ->filter(function($block) use ($name) {
                 return $name === 'default'
                 ? ($block->editor_name === $name || $block->editor_name === null)
                 : $block->editor_name === $name;
             })
             ->where('parent_id', null)
-            ->map(function ($block) use ($blockViewMappings, $renderChilds, $data) {
+            ->map(function($block) use ($blockViewMappings, $renderChilds, $data) {
                 if ($renderChilds) {
                     $childBlocks = $this->blocks->where('parent_id', $block->id);
 
-                    $renderedChildViews = $childBlocks->map(function ($childBlock) use ($blockViewMappings, $data) {
+                    $renderedChildViews = $childBlocks->map(function($childBlock) use ($blockViewMappings, $data) {
                         $view = $this->getBlockView($childBlock->type, $blockViewMappings);
                         return view($view, $data)->with('block', $childBlock)->render();
                     })->implode('');

src/Models/Block.php

Spacing +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
     public function scopeEditor($query, $name = 'default')
     {
         return $name === 'default' ?
-            $query->where('editor_name', $name)->orWhereNull('editor_name') :
-            $query->where('editor_name', $name);
+            $query->where('editor_name', $name)->orWhereNull('editor_name') : $query->where('editor_name', $name);
     }
 
     public function blockable()

src/Services/Blocks/Block.php

Spacing +3 added lines, -3 removed lines

@@ -204,7 +204,7 @@ 
         $this->isNewFormat = $this->isNewFormat($contents);
         $this->contents = $contents;
 
-        $this->parseMixedProperty('titleField', $contents, $this->name, function ($value, $options) {
+        $this->parseMixedProperty('titleField', $contents, $this->name, function($value, $options) {
             $this->titleField = $value;
             $this->hideTitlePrefix = (boolean) ($options['hidePrefix'] ?? false);
         });
@@ -311,14 +311,14 @@ 
             return $value;
         }
 
-        if ($configBlock = collect(config("twill.block_editor.blocks"))->filter(function ($block) use ($blockName) {
+        if ($configBlock = collect(config("twill.block_editor.blocks"))->filter(function($block) use ($blockName) {
             return Str::contains($block['component'], $blockName);
         })->first()) {
             if ($value = ($configBlock[$property] ?? null)) {
                 return $value;
             }
         }
-        if ($configRepeater = collect(config("twill.block_editor.repeaters"))->filter(function ($repeater) use ($blockName) {
+        if ($configRepeater = collect(config("twill.block_editor.repeaters"))->filter(function($repeater) use ($blockName) {
             return Str::contains($repeater['component'], $blockName);
         })->first()) {
             if ($value = ($configRepeater[$property] ?? null)) {

src/Commands/Build.php

Spacing +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
 
             try {
                 $process->start();
-            } catch(\Exception $e) {
+            } catch (\Exception $e) {
                 $this->warn("Could not start the chokidar watcher ({$e->getMessage()})\n");
             }
         } else {

src/Exceptions/Handler.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
         if ($frontend) {
             $view = config('twill.frontend.views_path') . ".errors.$statusCode";
 
-            return view()->exists($view)? $view : "errors::{$statusCode}";
+            return view()->exists($view) ? $view : "errors::{$statusCode}";
         }
 
         $view = "admin.errors.$statusCode";

src/Repositories/Behaviors/HandleRevisions.php

Spacing +2 added lines, -2 removed lines

@@ -17,11 +17,11 @@
      */
     public function hydrateHandleRevisions($object, $fields)
     {
-        foreach($this->getRepeaters() as $repeater) {
+        foreach ($this->getRepeaters() as $repeater) {
             $this->hydrateRepeater($object, $fields, $repeater['relation'], $repeater['model']);
         }
 
-        foreach($this->getBrowsers() as $browser) {
+        foreach ($this->getBrowsers() as $browser) {
             $this->hydrateBrowser($object, $fields, $browser['relation'], $browser['positionAttribute'], $browser['model']);
         }
 

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.unknown-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,