area17 / twill

src/Models/Behaviors/HasSlug.php

Spacing +15 added lines, -15 removed lines

@@ -10,39 +10,39 @@ 
 
     protected static function bootHasSlug()
     {
-        static::created(function ($model) {
+        static::created(function($model) {
             $model->setSlugs();
         });
 
-        static::updated(function ($model) {
+        static::updated(function($model) {
             $model->setSlugs();
         });
 
-        static::restored(function ($model) {
+        static::restored(function($model) {
             $model->setSlugs($restoring = true);
         });
     }
 
     public function slugs()
     {
-        return $this->hasMany("App\Models\Slugs\\".$this->getSlugClassName());
+        return $this->hasMany("App\Models\Slugs\\" . $this->getSlugClassName());
     }
 
     public function getSlugClass()
     {
-        $slugClassName = "App\Models\Slugs\\".$this->getSlugClassName();
+        $slugClassName = "App\Models\Slugs\\" . $this->getSlugClassName();
 
         return new $slugClassName();
     }
 
     protected function getSlugClassName()
     {
-        return class_basename($this).'Slug';
+        return class_basename($this) . 'Slug';
     }
 
     public function scopeForSlug($query, $slug)
     {
-        return $query->whereHas('slugs', function ($query) use ($slug) {
+        return $query->whereHas('slugs', function($query) use ($slug) {
             $query->whereSlug($slug);
             $query->whereActive(true);
             $query->whereLocale(app()->getLocale());
@@ -51,7 +51,7 @@ 
 
     public function scopeForInactiveSlug($query, $slug)
     {
-        return $query->whereHas('slugs', function ($query) use ($slug) {
+        return $query->whereHas('slugs', function($query) use ($slug) {
             $query->whereSlug($slug);
             $query->whereLocale(app()->getLocale());
         })->with(['slugs']);
@@ -92,11 +92,11 @@ 
         foreach ($slugParams as $key => $value) {
             //check variations of the slug
             if ($key == 'slug') {
-                $query->where(function ($query) use ($value) {
+                $query->where(function($query) use ($value) {
                     $query->orWhere('slug', $value);
-                    $query->orWhere('slug', $value.'-'.$this->getSuffixSlug());
+                    $query->orWhere('slug', $value . '-' . $this->getSuffixSlug());
                     for ($i = 2; $i <= $this->nb_variation_slug; $i++) {
-                        $query->orWhere('slug', $value.'-'.$i);
+                        $query->orWhere('slug', $value . '-' . $i);
                     }
                 });
             } else {
@@ -151,7 +151,7 @@ 
             }
 
             if (!empty($slugParams['slug'])) {
-                $slugParams['slug'] = $slugBackup.(($i > $this->nb_variation_slug) ? '-'.$this->getSuffixSlug() : "-{$i}");
+                $slugParams['slug'] = $slugBackup . (($i > $this->nb_variation_slug) ? '-' . $this->getSuffixSlug() : "-{$i}");
             }
         }
 
@@ -160,7 +160,7 @@ 
 
     public function getActiveSlug($locale = null)
     {
-        return $this->slugs->first(function ($slug) use ($locale) {
+        return $this->slugs->first(function($slug) use ($locale) {
             return ($slug->locale === ($locale ?? app()->getLocale())) && $slug->active;
         }) ?? null;
     }
@@ -269,7 +269,7 @@ 
 
     public function getForeignKey()
     {
-        return snake_case(class_basename(get_class($this))).'_id';
+        return snake_case(class_basename(get_class($this))) . '_id';
     }
 
     protected function getSuffixSlug()
@@ -372,7 +372,7 @@ 
         $str = preg_replace('/[^\p{L}\p{Nd}]+/u', $options['delimiter'], $str);
 
         // Remove duplicate delimiters
-        $str = preg_replace('/('.preg_quote($options['delimiter'], '/').'){2,}/', '$1', $str);
+        $str = preg_replace('/(' . preg_quote($options['delimiter'], '/') . '){2,}/', '$1', $str);
 
         // Truncate slug to max. characters
         $str = mb_substr($str, 0, ($options['limit'] ? $options['limit'] : mb_strlen($str, 'UTF-8')), 'UTF-8');

src/Models/Behaviors/HasBlocks.php

Spacing +4 added lines, -4 removed lines

@@ -13,11 +13,11 @@ 
 
     public function renderBlocks($renderChilds = true, $blockViewMappings = [], $data = [])
     {
-        return $this->blocks->where('parent_id', null)->map(function ($block) use ($blockViewMappings, $renderChilds, $data) {
+        return $this->blocks->where('parent_id', null)->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();
@@ -28,13 +28,13 @@ 
 
             $view = $this->getBlockView($block->type, $blockViewMappings);
 
-            return view($view, $data)->with('block', $block)->render().($renderedChildViews ?? '');
+            return view($view, $data)->with('block', $block)->render() . ($renderedChildViews ?? '');
         })->implode('');
     }
 
     private function getBlockView($blockType, $blockViewMappings = [])
     {
-        $view = config('twill.block_editor.block_views_path').'.'.$blockType;
+        $view = config('twill.block_editor.block_views_path') . '.' . $blockType;
 
         if (array_key_exists($blockType, $blockViewMappings)) {
             $view = $blockViewMappings[$blockType];

src/Models/Behaviors/HasPresenter.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
     public function present($presenter = 'presenter')
     {
         if (!$this->$presenter or !class_exists($this->$presenter)) {
-            throw new \Exception('Please set the Presenter path to your Presenter :'.$presenter.' FQN');
+            throw new \Exception('Please set the Presenter path to your Presenter :' . $presenter . ' FQN');
         }
 
         if (!$this->presenterInstance) {

src/Models/Behaviors/HasFiles.php

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
         $locale = $locale ?? app()->getLocale();
 
         if (!$file) {
-            $file = $this->files->first(function ($file) use ($role, $locale) {
+            $file = $this->files->first(function($file) use ($role, $locale) {
                 $localeScope = ($locale === 'fallback') ? true : ($file->pivot->locale === $locale);
 
                 return $file->pivot->role === $role && $localeScope;
@@ -33,7 +33,7 @@ 
     {
         $locale = $locale ?? app()->getLocale();
 
-        $files = $this->files->filter(function ($file) use ($role, $locale) {
+        $files = $this->files->filter(function($file) use ($role, $locale) {
             return $file->pivot->role === $role && $file->pivot->locale === $locale;
         });
 
@@ -50,7 +50,7 @@ 
     {
         $locale = $locale ?? app()->getLocale();
 
-        return $this->files->first(function ($key, $file) use ($role, $locale) {
+        return $this->files->first(function($key, $file) use ($role, $locale) {
             return $file->pivot->role === $role && $file->pivot->locale === $locale;
         });
     }

src/Models/Behaviors/HasTranslation.php

Spacing +6 added lines, -6 removed lines

@@ -10,7 +10,7 @@ 
 
     public function getTranslationModelNameDefault()
     {
-        return "App\Models\Translations\\".class_basename($this).'Translation';
+        return "App\Models\Translations\\" . class_basename($this) . 'Translation';
     }
 
     public function scopeWithActiveTranslations($query, $locale = null)
@@ -18,12 +18,12 @@ 
         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);
             });
 
-            return $query->with(['translations' => function ($query) use ($locale) {
+            return $query->with(['translations' => function($query) use ($locale) {
                 $query->whereActive(true);
                 $query->whereLocale($locale);
             }]);
@@ -75,14 +75,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 = config('translatable.locales');
 
             return array_search($translation['value'], $localesOrdered);
@@ -91,7 +91,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/Models/Behaviors/HasPosition.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 {
     protected static function bootHasPosition()
     {
-        static::creating(function ($model) {
+        static::creating(function($model) {
             $model->setToLastPosition();
         });
     }

src/Models/Behaviors/HasRevisions.php

Spacing +3 added lines, -3 removed lines

@@ -6,19 +6,19 @@
 {
     public function revisions()
     {
-        return $this->hasMany("App\Models\Revisions\\".class_basename($this).'Revision')->orderBy('created_at', 'desc');
+        return $this->hasMany("App\Models\Revisions\\" . class_basename($this) . 'Revision')->orderBy('created_at', 'desc');
     }
 
     public function scopeMine($query)
     {
-        return $query->whereHas('revisions', function ($query) {
+        return $query->whereHas('revisions', function($query) {
             $query->where('user_id', auth()->user()->id);
         });
     }
 
     public function revisionsArray()
     {
-        return $this->revisions->map(function ($revision) {
+        return $this->revisions->map(function($revision) {
             return [
                 'id'       => $revision->id,
                 'author'   => $revision->user->name ?? 'Unknown',

src/RouteServiceProvider.php

Spacing +26 added lines, -26 removed lines

@@ -25,48 +25,48 @@ 
     public function map(Router $router)
     {
         $router->group([
-            'namespace'  => config('twill.namespace', 'App').'\Http\Controllers\Admin',
+            'namespace'  => config('twill.namespace', 'App') . '\Http\Controllers\Admin',
             'domain'     => config('twill.admin_app_url'),
             'as'         => 'admin.',
             'middleware' => [config('twill.admin_middleware_group', 'web')],
             'prefix'     => rtrim(ltrim(config('twill.admin_app_path'), '/'), '/'),
-        ], function ($router) {
-            $router->group(['middleware' => ['auth', 'impersonate', 'validateBackHistory']], function ($router) {
+        ], function($router) {
+            $router->group(['middleware' => ['auth', 'impersonate', 'validateBackHistory']], function($router) {
                 require base_path('routes/admin.php');
             });
         });
 
         $router->group([
-            'namespace'  => $this->namespace.'\Admin',
+            'namespace'  => $this->namespace . '\Admin',
             'domain'     => config('twill.admin_app_url'),
             'as'         => 'admin.',
             'middleware' => [config('twill.admin_middleware_group', 'web')],
             'prefix'     => rtrim(ltrim(config('twill.admin_app_path'), '/'), '/'),
         ],
-            function ($router) {
-                $router->group(['middleware' => ['auth', 'impersonate', 'validateBackHistory']], function ($router) {
-                    require __DIR__.'/../routes/admin.php';
+            function($router) {
+                $router->group(['middleware' => ['auth', 'impersonate', 'validateBackHistory']], function($router) {
+                    require __DIR__ . '/../routes/admin.php';
                 });
 
-                $router->group(['middleware' => ['noDebugBar']], function ($router) {
-                    require __DIR__.'/../routes/auth.php';
+                $router->group(['middleware' => ['noDebugBar']], function($router) {
+                    require __DIR__ . '/../routes/auth.php';
                 });
 
-                $router->group(['middleware' => array_merge(['noDebugBar'], (app()->environment('production') ? ['auth'] : []))], function ($router) {
-                    require __DIR__.'/../routes/templates.php';
+                $router->group(['middleware' => array_merge(['noDebugBar'], (app()->environment('production') ? ['auth'] : []))], function($router) {
+                    require __DIR__ . '/../routes/templates.php';
                 });
             }
         );
 
         if (config('twill.templates_on_frontend_domain')) {
             $router->group([
-                'namespace'  => $this->namespace.'\Admin',
+                'namespace'  => $this->namespace . '\Admin',
                 'domain'     => config('app.url'),
                 'middleware' => [config('twill.admin_middleware_group', 'web')],
             ],
-                function ($router) {
-                    $router->group(['middleware' => array_merge(['noDebugBar'], (app()->environment('production') ? ['auth'] : []))], function ($router) {
-                        require __DIR__.'/../routes/templates.php';
+                function($router) {
+                    $router->group(['middleware' => array_merge(['noDebugBar'], (app()->environment('production') ? ['auth'] : []))], function($router) {
+                        require __DIR__ . '/../routes/templates.php';
                     });
                 }
             );
@@ -88,7 +88,7 @@ 
 
     protected function registerMacros()
     {
-        Route::macro('moduleShowWithPreview', function ($moduleName, $routePrefix = null, $controllerName = null) {
+        Route::macro('moduleShowWithPreview', function($moduleName, $routePrefix = null, $controllerName = null) {
             if ($routePrefix === null) {
                 $routePrefix = $moduleName;
             }
@@ -97,18 +97,18 @@ 
                 $controllerName = ucfirst(str_plural($moduleName));
             }
 
-            $routePrefix = empty($routePrefix) ? '/' : (starts_with($routePrefix, '/') ? $routePrefix : '/'.$routePrefix);
-            $routePrefix = ends_with($routePrefix, '/') ? $routePrefix : $routePrefix.'/';
+            $routePrefix = empty($routePrefix) ? '/' : (starts_with($routePrefix, '/') ? $routePrefix : '/' . $routePrefix);
+            $routePrefix = ends_with($routePrefix, '/') ? $routePrefix : $routePrefix . '/';
 
-            Route::name($moduleName.'.show')->get($routePrefix.'{slug}', $controllerName.'Controller@show');
-            Route::name($moduleName.'.preview')->get('/admin-preview'.$routePrefix.'{slug}', $controllerName.'Controller@show')->middleware(['web', 'auth', 'can:list']);
+            Route::name($moduleName . '.show')->get($routePrefix . '{slug}', $controllerName . 'Controller@show');
+            Route::name($moduleName . '.preview')->get('/admin-preview' . $routePrefix . '{slug}', $controllerName . 'Controller@show')->middleware(['web', 'auth', 'can:list']);
         });
 
-        Route::macro('module', function ($slug, $options = [], $resource_options = [], $resource = true) {
+        Route::macro('module', function($slug, $options = [], $resource_options = [], $resource = true) {
             $slugs = explode('.', $slug);
             $prefixSlug = str_replace('.', '/', $slug);
             $_slug = Arr::last($slugs);
-            $className = implode('', array_map(function ($s) {
+            $className = implode('', array_map(function($s) {
                 return ucfirst(str_singular($s));
             }, $slugs));
 
@@ -130,14 +130,14 @@ 
 
             foreach ($customRoutes as $route) {
                 $routeSlug = "{$prefixSlug}/{$route}";
-                $mapping = ['as' => $customRoutePrefix.".{$route}", 'uses' => "{$className}Controller@{$route}"];
+                $mapping = ['as' => $customRoutePrefix . ".{$route}", 'uses' => "{$className}Controller@{$route}"];
 
                 if (in_array($route, ['browser', 'tags'])) {
                     Route::get($routeSlug, $mapping);
                 }
 
                 if (in_array($route, ['status'])) {
-                    Route::get($routeSlug.'/{id}', $mapping);
+                    Route::get($routeSlug . '/{id}', $mapping);
                 }
 
                 if (in_array($route, ['publish', 'feature', 'restore', 'restoreRevision'])) {
@@ -145,7 +145,7 @@ 
                 }
 
                 if (in_array($route, ['preview'])) {
-                    Route::put($routeSlug.'/{id}', $mapping);
+                    Route::put($routeSlug . '/{id}', $mapping);
                 }
 
                 if (in_array($route, ['reorder', 'bulkPublish', 'bulkFeature', 'bulkDelete', 'bulkRestore'])) {
@@ -155,7 +155,7 @@ 
 
             if ($resource) {
                 $customRoutePrefix = !empty($groupPrefix) ? "{$groupPrefix}." : '';
-                Route::group(['as' => $customRoutePrefix], function () use ($slug, $className, $resource_options) {
+                Route::group(['as' => $customRoutePrefix], function() use ($slug, $className, $resource_options) {
                     Route::resource($slug, "{$className}Controller", $resource_options);
                 });
             }

src/Http/Controllers/Admin/DashboardController.php

Spacing +19 added lines, -19 removed lines

@@ -75,21 +75,21 @@ 
 
     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();
     }
 
     private function getLoggedInUserActivities()
     {
-        return Activity::where('causer_id', auth()->user()->id)->take(20)->latest()->get()->map(function ($activity) {
+        return Activity::where('causer_id', auth()->user()->id)->take(20)->latest()->get()->map(function($activity) {
             return $this->formatActivity($activity);
         })->filter()->values();
     }
 
     private function formatActivity($activity)
     {
-        $dashboardModule = config('twill.dashboard.modules.'.$activity->subject_type);
+        $dashboardModule = config('twill.dashboard.modules.' . $activity->subject_type);
 
         if (!$dashboardModule) {
             return;
@@ -125,7 +125,7 @@ 
             return [];
         }
 
-        $statsByDate = collect($response['rows'] ?? [])->map(function (array $dateRow) {
+        $statsByDate = collect($response['rows'] ?? [])->map(function(array $dateRow) {
             return [
                 'date'                => $dateRow[0],
                 'users'               => (int) $dateRow[1],
@@ -140,7 +140,7 @@ 
             'yesterday',
             'week',
             'month',
-        ])->mapWithKeys(function ($period) use ($statsByDate) {
+        ])->mapWithKeys(function($period) use ($statsByDate) {
             $stats = $this->getPeriodStats($period, $statsByDate);
 
             return [
@@ -148,7 +148,7 @@ 
                     [
                         'label'   => 'Users',
                         'figure'  => $this->formatStat($stats['stats']['users']),
-                        'insight' => round($stats['stats']['bounceRate']).'% Bounce rate',
+                        'insight' => round($stats['stats']['bounceRate']) . '% Bounce rate',
                         'trend'   => $stats['moreUsers'] ? 'up' : 'down',
                         'data'    => $stats['usersData']->reverse()->values()->toArray(),
                         'url'     => 'https://analytics.google.com/analytics/web',
@@ -156,7 +156,7 @@ 
                     [
                         'label'   => 'Pageviews',
                         'figure'  => $this->formatStat($stats['stats']['pageViews']),
-                        'insight' => round($stats['stats']['pageviewsPerSession'], 1).' Pages / Session',
+                        'insight' => round($stats['stats']['pageviewsPerSession'], 1) . ' Pages / Session',
                         'trend'   => $stats['morePageViews'] ? 'up' : 'down',
                         'data'    => $stats['pageViewsData']->reverse()->values()->toArray(),
                         'url'     => 'https://analytics.google.com/analytics/web',
@@ -173,10 +173,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'];
                 }),
             ];
@@ -185,10 +185,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'];
                 }),
             ];
@@ -211,10 +211,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'];
                 }),
             ];
@@ -237,10 +237,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'];
                 }),
             ];
@@ -250,7 +250,7 @@ 
     private function formatStat($count)
     {
         if ($count >= 1000) {
-            return round($count / 1000, 1).'k';
+            return round($count / 1000, 1) . 'k';
         }
 
         return $count;
@@ -258,9 +258,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 = [
@@ -293,6 +293,6 @@ 
 
     private function getRepository($module)
     {
-        return app(config('twill.namespace')."\Repositories\\".ucfirst(str_singular($module)).'Repository');
+        return app(config('twill.namespace') . "\Repositories\\" . ucfirst(str_singular($module)) . 'Repository');
     }
 }