area17 / twill

src/Commands/RefreshLQIP.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
     // TODO: document this and actually think about moving to queuable job after content type updates
     public function handle()
     {
-        $this->db->table(config('twill.mediables_table', 'twill_mediables'))->orderBy('id')->chunk(100, function ($attached_medias) {
+        $this->db->table(config('twill.mediables_table', 'twill_mediables'))->orderBy('id')->chunk(100, function($attached_medias) {
             foreach ($attached_medias as $attached_media) {
                 $uuid = Media::withTrashed()->find($attached_media->media_id, ['uuid'])->uuid;
 

src/Repositories/ModuleRepository.php

Spacing +20 added lines, -20 removed lines

@@ -183,7 +183,7 @@ 
 
         foreach ($fields as $field) {
             if (in_array($field, $translatedAttributes)) {
-                $query->orWhereHas('translations', function ($q) use ($field, $search) {
+                $query->orWhereHas('translations', function($q) use ($field, $search) {
                     $q->where($field, $this->getLikeOperator(), "%{$search}%");
                 });
             } else {
@@ -210,7 +210,7 @@ 
      */
     public function create($fields)
     {
-        return DB::transaction(function () use ($fields) {
+        return DB::transaction(function() use ($fields) {
             $original_fields = $fields;
 
             $fields = $this->prepareFieldsBeforeCreate($fields);
@@ -265,7 +265,7 @@ 
      */
     public function update($id, $fields)
     {
-        DB::transaction(function () use ($id, $fields) {
+        DB::transaction(function() use ($id, $fields) {
             $object = $this->model->findOrFail($id);
 
             $this->beforeSave($object, $fields);
@@ -288,7 +288,7 @@ 
      */
     public function updateBasic($id, $values, $scopes = [])
     {
-        return DB::transaction(function () use ($id, $values, $scopes) {
+        return DB::transaction(function() use ($id, $values, $scopes) {
             // apply scopes if no id provided
             if (is_null($id)) {
                 $query = $this->model->query();
@@ -299,7 +299,7 @@ 
 
                 $query->update($values);
 
-                $query->get()->each(function ($object) use ($values) {
+                $query->get()->each(function($object) use ($values) {
                     $this->afterUpdateBasic($object, $values);
                 });
 
@@ -311,7 +311,7 @@ 
                 $query = $this->model->whereIn('id', $id);
                 $query->update($values);
 
-                $query->get()->each(function ($object) use ($values) {
+                $query->get()->each(function($object) use ($values) {
                     $this->afterUpdateBasic($object, $values);
                 });
 
@@ -334,7 +334,7 @@ 
      */
     public function setNewOrder($ids)
     {
-        DB::transaction(function () use ($ids) {
+        DB::transaction(function() use ($ids) {
             $this->model->setNewOrder($ids);
         }, 3);
     }
@@ -345,7 +345,7 @@ 
      */
     public function delete($id)
     {
-        return DB::transaction(function () use ($id) {
+        return DB::transaction(function() use ($id) {
             if (($object = $this->model->find($id)) === null) {
                 return false;
             }
@@ -365,9 +365,9 @@ 
      */
     public function bulkDelete($ids)
     {
-        return DB::transaction(function () use ($ids) {
+        return DB::transaction(function() use ($ids) {
             try {
-                Collection::make($ids)->each(function ($id) {
+                Collection::make($ids)->each(function($id) {
                     $this->delete($id);
                 });
             } catch (\Exception $e) {
@@ -385,7 +385,7 @@ 
      */
     public function forceDelete($id)
     {
-        return DB::transaction(function () use ($id) {
+        return DB::transaction(function() use ($id) {
             if (($object = $this->model->onlyTrashed()->find($id)) === null) {
                 return false;
             } else {
@@ -402,14 +402,14 @@ 
      */
     public function bulkForceDelete($ids)
     {
-        return DB::transaction(function () use ($ids) {
+        return DB::transaction(function() use ($ids) {
             try {
                 $query = $this->model->onlyTrashed()->whereIn('id', $ids);
                 $objects = $query->get();
 
                 $query->forceDelete();
 
-                $objects->each(function ($object) {
+                $objects->each(function($object) {
                     $this->afterDelete($object);
                 });
             } catch (\Exception $e) {
@@ -427,7 +427,7 @@ 
      */
     public function restore($id)
     {
-        return DB::transaction(function () use ($id) {
+        return DB::transaction(function() use ($id) {
             if (($object = $this->model->withTrashed()->find($id)) != null) {
                 $object->restore();
                 $this->afterRestore($object);
@@ -444,14 +444,14 @@ 
      */
     public function bulkRestore($ids)
     {
-        return DB::transaction(function () use ($ids) {
+        return DB::transaction(function() use ($ids) {
             try {
                 $query = $this->model->withTrashed()->whereIn('id', $ids);
                 $objects = $query->get();
 
                 $query->restore();
 
-                $objects->each(function ($object) {
+                $objects->each(function($object) {
                     $this->afterRestore($object);
                 });
             } catch (\Exception $e) {
@@ -726,7 +726,7 @@ 
     {
         if (isset($scopes[$scopeField])) {
             $id = $scopes[$scopeField];
-            $query->whereHas($scopeRelation, function ($query) use ($id, $scopeField) {
+            $query->whereHas($scopeRelation, function($query) use ($id, $scopeField) {
                 $query->where($scopeField, $id);
             });
             unset($scopes[$scopeField]);
@@ -757,7 +757,7 @@ 
     {
 
         if (isset($scopes[$scopeField]) && is_string($scopes[$scopeField])) {
-            $query->where(function ($query) use (&$scopes, $scopeField, $orFields) {
+            $query->where(function($query) use (&$scopes, $scopeField, $orFields) {
                 foreach ($orFields as $field) {
                     $query->orWhere($field, $this->getLikeOperator(), '%' . $scopes[$scopeField] . '%');
                     unset($scopes[$field]);
@@ -833,11 +833,11 @@ 
 
         $uniqueTraits = array_unique(array_map('class_basename', $traits));
 
-        $methods = array_map(function (string $trait) use ($method) {
+        $methods = array_map(function(string $trait) use ($method) {
             return $method . $trait;
         }, $uniqueTraits);
 
-        return array_filter($methods, function (string $method) {
+        return array_filter($methods, function(string $method) {
             return method_exists(get_called_class(), $method);
         });
     }

src/Repositories/Behaviors/HandleSlugs.php

Spacing +1 added lines, -1 removed lines

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

src/AuthServiceProvider.php

Spacing +23 added lines, -23 removed lines

@@ -31,78 +31,78 @@
 
     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('duplicate', function ($user) {
-            return $this->authorize($user, function ($user) {
+        Gate::define('duplicate', 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/Behaviors/HandleFieldsGroups.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
             if ($object->$group) {
                 $decoded_fields = json_decode($object->$group, true) ?? [];
                 // In case that some field read the value through $item->$name
-                foreach($decoded_fields as $field_name => $field_value) {
+                foreach ($decoded_fields as $field_name => $field_value) {
                     $object->setAttribute($field_name, $field_value);
                 }
                 $fields = array_merge($fields, $decoded_fields);
@@ -50,7 +50,7 @@ 
 
     protected function handleFieldsGroups($fields) {
         foreach ($this->fieldsGroups as $group => $groupFields) {
-            $fields[$group] = Arr::where(Arr::only($fields, $groupFields), function ($value, $key) {
+            $fields[$group] = Arr::where(Arr::only($fields, $groupFields), function($value, $key) {
                 return !empty($value);
             });
             

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'],
@@ -100,7 +100,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,
@@ -109,7 +109,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) use ($bucket) {
+                'children' => Feature::where('bucket_key', $bucketKey)->with('featured')->get()->map(function($feature) use ($bucket) {
                     if (($item = $feature->featured) != null) {
                         $forModuleRepository = collect($bucket['bucketables'])->where('module', $feature->featured_type)->first()['repository'] ?? null;
                         $repository = $this->getRepository($feature->featured_type, $forModuleRepository);
@@ -128,7 +128,7 @@ 
                             'thumbnail' => $item->defaultCmsImage(['w' => 100, 'h' => 100]),
                         ] : []);
                     }
-                })->reject(function ($item) {
+                })->reject(function($item) {
                     return is_null($item);
                 })->values()->toArray(),
             ];
@@ -146,8 +146,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, $search, $request) {
+        Collection::make($featuredSection['buckets'])->map(function($bucket, $bucketKey) use (&$fetchedModules, $search, $request) {
+            return Collection::make($bucket['bucketables'])->mapWithKeys(function($bucketable) use (&$fetchedModules, $search, $request) {
 
                 $module = $bucketable['module'];
                 $repository = $this->getRepository($module, $bucketable['repository'] ?? null);
@@ -176,12 +176,12 @@ 
                     'withImage' => $withImage,
                 ]];
             });
-        })->each(function ($bucketables, $bucket) use (&$featuredSources) {
-            $bucketables->each(function ($bucketableData, $bucketable) use (&$featuredSources) {
+        })->each(function($bucketables, $bucket) use (&$featuredSources) {
+            $bucketables->each(function($bucketableData, $bucketable) use (&$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,
@@ -210,8 +210,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/ValidationServiceProvider.php

Spacing +5 added lines, -5 removed lines

@@ -16,23 +16,23 @@
      */
     public function boot()
     {
-        Validator::extend('absolute_or_relative_url', function ($attribute, $value, $parameters, $validator) {
+        Validator::extend('absolute_or_relative_url', function($attribute, $value, $parameters, $validator) {
             return Str::startsWith($value, '/') || Validator::make([$attribute => $value], [$attribute => 'url'])->passes();
         }, 'The :attribute should be a valid url (absolute or relative)');
 
-        Validator::extend('relative_or_secure_url', function ($attribute, $value, $parameters) {
+        Validator::extend('relative_or_secure_url', function($attribute, $value, $parameters) {
             return Str::startsWith($value, '/') || filter_var($value, FILTER_VALIDATE_URL) !== false && Str::startsWith($value, 'https');
         }, 'The :attribute should be a valid url (relative or https)');
 
-        Validator::extend('web_color', function ($attribute, $value, $parameters, $validator) {
+        Validator::extend('web_color', function($attribute, $value, $parameters, $validator) {
             return preg_match('/^([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/i', $value);
         });
 
-        Validator::extend('phone_number', function ($attribute, $value, $parameters) {
+        Validator::extend('phone_number', function($attribute, $value, $parameters) {
             return preg_match("/^[+]?[0-9\-\ ]*$/", $value);
         });
 
-        Validator::extend('validBlocks', function ($attribute, $value, $parameters, $validator) {
+        Validator::extend('validBlocks', function($attribute, $value, $parameters, $validator) {
             $blockMessages = [];
 
             foreach ($value as $block) {

src/Commands/ListIcons.php

Spacing +3 added lines, -3 removed lines

@@ -65,14 +65,14 @@ 
     {
         return collect(
             config('twill.block_editor.directories.source.icons')
-        )->reduce(function (Collection $keep, $path) {
+        )->reduce(function(Collection $keep, $path) {
             if (!$this->files->exists($path)) {
                 $this->displayError("Directory not found: {$path}");
 
                 return $keep;
             }
 
-            $files = collect($this->files->files($path))->map(function (
+            $files = collect($this->files->files($path))->map(function(
                 SplFileInfo $file
             ) {
                 return [
@@ -92,7 +92,7 @@ 
      */
     public function handle()
     {
-        $icons = $this->getIconList()->filter(function ($icon) {
+        $icons = $this->getIconList()->filter(function($icon) {
             return $this->isAllowed($icon);
         });
 

src/Http/Controllers/Admin/BlocksController.php

Spacing +3 added lines, -3 removed lines

@@ -51,10 +51,10 @@ 
 
         $this->getChildrenPreview($block['blocks'], $blocksCollection, $newBlock->id, $blockId, $blockRepository);
 
-        $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, [
@@ -108,7 +108,7 @@ 
 
     protected function getChildrenPreview($blocks, $blocksCollection, $parentId, &$blockId, $blockRepository)
     {
-        $blocks->each(function ($childBlock) use (&$blockId, $parentId, $blocksCollection, $blockRepository) {
+        $blocks->each(function($childBlock) use (&$blockId, $parentId, $blocksCollection, $blockRepository) {
             $childBlock['parent_id'] = $parentId;
             $blockId++;
             $newChildBlock = $blockRepository->createForPreview($childBlock);