area17 / twill

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/FileLibraryController.php

Spacing +3 added lines, -3 removed lines

@@ -88,7 +88,7 @@ 
         $items = $this->getIndexItems($scopes);
 
         return [
-            'items' => $items->map(function ($item) {
+            'items' => $items->map(function($item) {
                 return $this->buildFile($item);
             })->toArray(),
             'maxPage' => $items->lastPage(),
@@ -104,7 +104,7 @@ 
     private function buildFile($item)
     {
         return $item->toCmsArray() + [
-            'tags' => $item->tags->map(function ($tag) {
+            'tags' => $item->tags->map(function($tag) {
                 return $tag->name;
             }),
             'deleteUrl' => $item->canDeleteSafely() ? moduleRoute($this->moduleName, $this->routePrefix, 'destroy', $item->id) : null,
@@ -225,7 +225,7 @@ 
         $items = $this->getIndexItems($scopes);
 
         return $this->responseFactory->json([
-            'items' => $items->map(function ($item) {
+            'items' => $items->map(function($item) {
                 return $this->buildFile($item);
             })->toArray(),
             'tags' => $this->repository->getTagsList(),

src/Http/Controllers/Admin/BlocksController.php

Spacing +3 added lines, -3 removed lines

@@ -56,16 +56,16 @@
 
         $blocksCollection->push($newBlock);
 
-        $block['blocks']->each(function ($childBlock) use ($newBlock, $blocksCollection, $blockRepository) {
+        $block['blocks']->each(function($childBlock) use ($newBlock, $blocksCollection, $blockRepository) {
             $childBlock['parent_id'] = $newBlock->id;
             $newChildBlock = $blockRepository->createForPreview($childBlock);
             $blocksCollection->push($newChildBlock);
         });
 
-        $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, [

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']);
 
             $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();
     }
@@ -201,7 +201,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],
@@ -216,7 +216,7 @@ 
             'yesterday',
             'week',
             'month',
-        ])->mapWithKeys(function ($period) use ($statsByDate) {
+        ])->mapWithKeys(function($period) use ($statsByDate) {
             $stats = $this->getPeriodStats($period, $statsByDate);
             return [
                 $period => [
@@ -253,10 +253,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'];
                 }),
             ];
@@ -265,10 +265,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'];
                 }),
             ];
@@ -291,10 +291,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'];
                 }),
             ];
@@ -317,10 +317,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'];
                 }),
             ];
@@ -346,9 +346,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 = [
@@ -385,14 +385,14 @@ 
      */
     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']);
 
             $drafts = $repository->draft()->mine()->limit(3)->latest()->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,

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('mediables')->orderBy('id')->chunk(100, function ($attached_medias) {
+        $this->db->table('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/SettingRepository.php

Spacing +5 added lines, -5 removed lines

@@ -34,7 +34,7 @@ 
      */
     public function byKey($key, $section = null)
     {
-        return $this->model->when($section, function ($query) use ($section) {
+        return $this->model->when($section, function($query) use ($section) {
             $query->where('section', $section);
         })->where('key', $key)->exists() ? $this->model->where('key', $key)->with('translations')->first()->value : null;
     }
@@ -45,15 +45,15 @@ 
      */
     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();
 
-        $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) {
@@ -101,7 +101,7 @@ 
             $this->updateOrCreate($section + ['key' => $role], $section + [
                 'key' => $role,
                 'medias' => [
-                    $role => Collection::make($settingsFields['medias'][$role])->map(function ($media) {
+                    $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

@@ -23,12 +23,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;
                 }));
 
@@ -38,7 +38,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,
@@ -79,7 +79,7 @@ 
     {
         if (property_exists($this->model, 'translatedAttributes')) {
             $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, 'like', '%' . $scopes[$attribute] . '%');

src/Repositories/Behaviors/HandleBlocks.php

Spacing +12 added lines, -12 removed lines

@@ -70,11 +70,11 @@ 
 
         $blockRepository->bulkDelete($object->blocks()->pluck('id')->toArray());
 
-        $this->getBlocks($object, $fields)->each(function ($block) use ($object, $blockRepository) {
+        $this->getBlocks($object, $fields)->each(function($block) use ($object, $blockRepository) {
 
             $blockCreated = $blockRepository->create($block);
 
-            $block['blocks']->each(function ($childBlock) use ($blockCreated, $blockRepository) {
+            $block['blocks']->each(function($childBlock) use ($blockCreated, $blockRepository) {
                 $childBlock['parent_id'] = $blockCreated->id;
                 $blockRepository->create($childBlock);
             });
@@ -173,9 +173,9 @@ 
                     ];
                 }
 
-                $fields['blocksFields'][] = Collection::make($block['content'])->filter(function ($value, $key) {
+                $fields['blocksFields'][] = Collection::make($block['content'])->filter(function($value, $key) {
                     return $key !== "browsers";
-                })->map(function ($value, $key) use ($block) {
+                })->map(function($value, $key) use ($block) {
                     return [
                         'name' => "blocks[$block->id][$key]",
                         'value' => $value,
@@ -188,15 +188,15 @@ 
 
                 if ($medias) {
                     if (config('twill.media_library.translated_form_fields', false)) {
-                        $fields['blocksMedias'][] = Collection::make($medias)->mapWithKeys(function ($mediasByLocale, $locale) use ($block) {
-                            return Collection::make($mediasByLocale)->mapWithKeys(function ($value, $key) use ($block, $locale) {
+                        $fields['blocksMedias'][] = Collection::make($medias)->mapWithKeys(function($mediasByLocale, $locale) use ($block) {
+                            return Collection::make($mediasByLocale)->mapWithKeys(function($value, $key) use ($block, $locale) {
                                 return [
                                     "blocks[$block->id][$key][$locale]" => $value,
                                 ];
                             });
                         })->filter()->toArray();
                     } else {
-                        $fields['blocksMedias'][] = Collection::make($medias)->mapWithKeys(function ($value, $key) use ($block) {
+                        $fields['blocksMedias'][] = Collection::make($medias)->mapWithKeys(function($value, $key) use ($block) {
                             return [
                                 "blocks[$block->id][$key]" => $value,
                             ];
@@ -207,8 +207,8 @@ 
                 $files = $blockFormFields['files'];
 
                 if ($files) {
-                    Collection::make($files)->each(function ($rolesWithFiles, $locale) use (&$fields, $block) {
-                        $fields['blocksFiles'][] = Collection::make($rolesWithFiles)->mapWithKeys(function ($files, $role) use ($locale, $block) {
+                    Collection::make($files)->each(function($rolesWithFiles, $locale) use (&$fields, $block) {
+                        $fields['blocksFiles'][] = Collection::make($rolesWithFiles)->mapWithKeys(function($files, $role) use ($locale, $block) {
                             return [
                                 "blocks[$block->id][$role][$locale]" => $files,
                             ];
@@ -247,7 +247,7 @@ 
      */
     protected function getBlockBrowsers($block)
     {
-        return Collection::make($block['content']['browsers'])->mapWithKeys(function ($ids, $relation) use ($block) {
+        return Collection::make($block['content']['browsers'])->mapWithKeys(function($ids, $relation) use ($block) {
             $relationRepository = $this->getModelRepository($relation);
             $relatedItems = $relationRepository->get([], ['id' => $ids], [], -1);
             $sortedRelatedItems = array_flip($ids);
@@ -256,9 +256,9 @@ 
                 $sortedRelatedItems[$item->id] = $item;
             }
 
-            $items = Collection::make(array_values($sortedRelatedItems))->filter(function ($value) {
+            $items = Collection::make(array_values($sortedRelatedItems))->filter(function($value) {
                 return is_object($value);
-            })->map(function ($relatedElement) use ($relation) {
+            })->map(function($relatedElement) use ($relation) {
                 return [
                     'id' => $relatedElement->id,
                     'name' => $relatedElement->titleInBrowser ?? $relatedElement->title,

src/Repositories/Behaviors/HandleMedias.php

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
         $mediasCollection = Collection::make();
         $mediasFromFields = $this->getMedias($fields);
 
-        $mediasFromFields->each(function ($media) use ($object, $mediasCollection) {
+        $mediasFromFields->each(function($media) use ($object, $mediasCollection) {
             $newMedia = Media::withTrashed()->find(is_array($media['id']) ? Arr::first($media['id']) : $media['id']);
             $pivot = $newMedia->newPivot($object, Arr::except($media, ['id']), 'mediables', true);
             $newMedia->setRelation('pivot', $pivot);
@@ -48,7 +48,7 @@ 
 
         $object->medias()->sync([]);
 
-        $this->getMedias($fields)->each(function ($media) use ($object) {
+        $this->getMedias($fields)->each(function($media) use ($object) {
             $object->medias()->attach($media['id'], Arr::except($media, ['id']));
         });
     }
@@ -77,7 +77,7 @@ 
                 if (in_array($role, array_keys($this->model->mediasParams ?? []))
                     || in_array($role, array_keys(config('twill.block_editor.crops', [])))
                     || in_array($role, array_keys(config('twill.settings.crops', [])))) {
-                    Collection::make($mediasForRole)->each(function ($media) use (&$medias, $role, $locale) {
+                    Collection::make($mediasForRole)->each(function($media) use (&$medias, $role, $locale) {
                         $customMetadatas = $media['metadatas']['custom'] ?? [];
                         if (isset($media['crops']) && !empty($media['crops'])) {
                             foreach ($media['crops'] as $cropName => $cropData) {