area17 / twill

src/Models/Behaviors/HasRevisions.php

Spacing +2 added lines, -2 removed lines

@@ -11,14 +11,14 @@
 
     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);
         });
     }
 
     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/Models/Behaviors/HasMedias.php

Spacing +11 added lines, -11 removed lines

@@ -33,7 +33,7 @@ 
 
     private function findMedia($role, $crop = "default")
     {
-        $media = $this->medias->first(function ($media) use ($role, $crop) {
+        $media = $this->medias->first(function($media) use ($role, $crop) {
             if (config('twill.media_library.translated_form_fields', false)) {
                 $localeScope = $media->pivot->locale === app()->getLocale();
             }
@@ -42,7 +42,7 @@ 
         });
 
         if (!$media && config('twill.media_library.translated_form_fields', false)) {
-            $media = $this->medias->first(function ($media) use ($role, $crop) {
+            $media = $this->medias->first(function($media) use ($role, $crop) {
                 return $media->pivot->role === $role && $media->pivot->crop === $crop;
             });
         }
@@ -85,7 +85,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;
         });
 
@@ -120,7 +120,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;
         });
 
@@ -136,12 +136,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); ;
             });
         }
 
@@ -155,12 +155,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); ;
             });
         }
 
@@ -174,12 +174,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); ;
             });
         }
 
@@ -248,7 +248,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/Models/Behaviors/HasFiles.php

Spacing +3 added lines, -3 removed lines

@@ -16,12 +16,12 @@ 
     {
         $locale = $locale ?? app()->getLocale();
 
-        $file = $this->files->first(function ($file) use ($role, $locale) {
+        $file = $this->files->first(function($file) use ($role, $locale) {
             return $file->pivot->role === $role && $file->pivot->locale === $locale;
         });
 
         if (!$file && config('translatable.use_property_fallback', false)) {
-            $file = $this->files->first(function ($file) use ($role) {
+            $file = $this->files->first(function($file) use ($role) {
                 return $file->pivot->role === $role && $file->pivot->locale === config('translatable.fallback_locale');
             });
         }
@@ -47,7 +47,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;
         });
 

src/Models/Behaviors/HasRelated.php

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
 
         return $this->relatedCache[$browser_name] = $this->relatedItems
             ->where('browser_name', $browser_name)
-            ->map(function ($item) {
+            ->map(function($item) {
                 return $item->related;
             });
     }
@@ -46,9 +46,9 @@ 
 
         $position = 1;
 
-        Collection::make($items)->map(function ($item) {
+        Collection::make($items)->map(function($item) {
             return Arr::only($item, ['endpointType', 'id']);
-        })->each(function ($values) use ($browser_name, &$position) {
+        })->each(function($values) use ($browser_name, &$position) {
             RelatedItem::create([
                 'subject_id' => $this->getKey(),
                 'subject_type' => $this->getMorphClass(),

src/Models/Feature.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
     public function scopeForBucket($query, $bucketKey)
     {
-        return $query->where('bucket_key', $bucketKey)->get()->map(function ($feature) {
+        return $query->where('bucket_key', $bucketKey)->get()->map(function($feature) {
             return $feature->featured;
         })->filter();
     }

src/TwillServiceProvider.php

Spacing +9 added lines, -9 removed lines

@@ -109,13 +109,13 @@ 
         }
 
         if (config('twill.enabled.media-library')) {
-            $this->app->singleton('imageService', function () {
+            $this->app->singleton('imageService', function() {
                 return $this->app->make(config('twill.media_library.image_service'));
             });
         }
 
         if (config('twill.enabled.file-library')) {
-            $this->app->singleton('fileService', function () {
+            $this->app->singleton('fileService', function() {
                 return $this->app->make(config('twill.file_library.file_service'));
             });
         }
@@ -343,20 +343,20 @@ 
     {
         $blade = $this->app['view']->getEngineResolver()->resolve('blade')->getCompiler();
 
-        $blade->directive('dd', function ($param) {
+        $blade->directive('dd', function($param) {
             return "<?php dd({$param}); ?>";
         });
 
-        $blade->directive('dumpData', function ($data) {
+        $blade->directive('dumpData', function($data) {
             return sprintf("<?php (new Symfony\Component\VarDumper\VarDumper)->dump(%s); exit; ?>",
                 null != $data ? $data : "get_defined_vars()");
         });
 
-        $blade->directive('formField', function ($expression) use ($blade) {
+        $blade->directive('formField', function($expression) use ($blade) {
             return $this->includeView('partials.form._', $expression);
         });
 
-        $blade->directive('partialView', function ($expression) use ($blade) {
+        $blade->directive('partialView', function($expression) use ($blade) {
 
             $expressionAsArray = str_getcsv($expression, ',', '\'');
 
@@ -392,13 +392,13 @@ 
             ?>";
         });
 
-        $blade->directive('pushonce', function ($expression) {
+        $blade->directive('pushonce', function($expression) {
             list($pushName, $pushSub) = explode(':', trim(substr($expression, 1, -1)));
             $key = '__pushonce_' . $pushName . '_' . str_replace('-', '_', $pushSub);
             return "<?php if(! isset(\$__env->{$key})): \$__env->{$key} = 1; \$__env->startPush('{$pushName}'); ?>";
         });
 
-        $blade->directive('endpushonce', function () {
+        $blade->directive('endpushonce', function() {
             return '<?php $__env->stopPush(); endif; ?>';
         });
     }
@@ -424,7 +424,7 @@ 
 
         View::composer('twill::partials.navigation.*', ActiveNavigation::class);
 
-        View::composer(['admin.*', 'templates.*', 'twill::*'], function ($view) {
+        View::composer(['admin.*', 'templates.*', 'twill::*'], function($view) {
             $with = array_merge([
                 'renderForBlocks' => false,
                 'renderForModal' => false,

src/RouteServiceProvider.php

Spacing +12 added lines, -12 removed lines

@@ -49,8 +49,8 @@ 
                 'as' => 'admin.',
                 'middleware' => [config('twill.admin_middleware_group', 'web')],
                 'prefix' => rtrim(ltrim(config('twill.admin_app_path'), '/'), '/'),
-            ], function ($router) {
-                $router->group(['middleware' => ['twill_auth:twill_users', 'impersonate', 'validateBackHistory']], function ($router) {
+            ], function($router) {
+                $router->group(['middleware' => ['twill_auth:twill_users', 'impersonate', 'validateBackHistory']], function($router) {
                     require base_path('routes/admin.php');
                 });
             });
@@ -63,16 +63,16 @@ 
             'middleware' => [config('twill.admin_middleware_group', 'web')],
             'prefix' => rtrim(ltrim(config('twill.admin_app_path'), '/'), '/'),
         ],
-            function ($router) {
-                $router->group(['middleware' => ['twill_auth:twill_users', 'impersonate', 'validateBackHistory']], function ($router) {
+            function($router) {
+                $router->group(['middleware' => ['twill_auth:twill_users', 'impersonate', 'validateBackHistory']], function($router) {
                     require __DIR__ . '/../routes/admin.php';
                 });
 
-                $router->group([], function ($router) {
+                $router->group([], function($router) {
                     require __DIR__ . '/../routes/auth.php';
                 });
 
-                $router->group(['middleware' => $this->app->environment('production') ? ['twill_auth:twill_users'] : []], function ($router) {
+                $router->group(['middleware' => $this->app->environment('production') ? ['twill_auth:twill_users'] : []], function($router) {
                     require __DIR__ . '/../routes/templates.php';
                 });
             }
@@ -84,8 +84,8 @@ 
                 'domain' => config('app.url'),
                 'middleware' => [config('twill.admin_middleware_group', 'web')],
             ],
-                function ($router) {
-                    $router->group(['middleware' => $this->app->environment('production') ? ['twill_auth:twill_users'] : []], function ($router) {
+                function($router) {
+                    $router->group(['middleware' => $this->app->environment('production') ? ['twill_auth:twill_users'] : []], function($router) {
                         require __DIR__ . '/../routes/templates.php';
                     });
                 }
@@ -118,7 +118,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;
             }
@@ -134,12 +134,12 @@ 
             Route::name($moduleName . '.preview')->get('/admin-preview' . $routePrefix . '{slug}', $controllerName . 'Controller@show')->middleware(['web', 'twill_auth:twill_users', '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));
 
@@ -186,7 +186,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/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);
         });