area17 / twill

src/AuthServiceProvider.php

Spacing +21 added lines, -21 removed lines

@@ -31,72 +31,72 @@
 
     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('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/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/UserRepository.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
      */
     public function filter($query, array $scopes = [])
     {
-        $query->when(isset($scopes['role']), function ($query) use ($scopes) {
+        $query->when(isset($scopes['role']), function($query) use ($scopes) {
             $query->where('role', $scopes['role']);
         });
         $query->where('role', '<>', 'SUPERADMIN');

src/Repositories/Behaviors/HandleRepeaters.php

Spacing +5 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
         $relationRepository = $this->getModelRepository($relation, $model);
 
         if (!$keepExisting) {
-            $object->$relation()->each(function ($repeaterElement) {
+            $object->$relation()->each(function($repeaterElement) {
                 $repeaterElement->forceDelete();
             });
         }
@@ -112,8 +112,8 @@ 
 
             if (isset($relatedItemFormFields['medias'])) {
                 if (config('twill.media_library.translated_form_fields', false)) {
-                    Collection::make($relatedItemFormFields['medias'])->each(function ($rolesWithMedias, $locale) use (&$repeatersMedias, $relation, $relationItem) {
-                        $repeatersMedias[] = Collection::make($rolesWithMedias)->mapWithKeys(function ($medias, $role) use ($locale, $relation, $relationItem) {
+                    Collection::make($relatedItemFormFields['medias'])->each(function($rolesWithMedias, $locale) use (&$repeatersMedias, $relation, $relationItem) {
+                        $repeatersMedias[] = Collection::make($rolesWithMedias)->mapWithKeys(function($medias, $role) use ($locale, $relation, $relationItem) {
                             return [
                                 "blocks[$relation-$relationItem->id][$role][$locale]" => $medias,
                             ];
@@ -127,8 +127,8 @@ 
             }
 
             if (isset($relatedItemFormFields['files'])) {
-                Collection::make($relatedItemFormFields['files'])->each(function ($rolesWithFiles, $locale) use (&$repeatersFiles, $relation, $relationItem) {
-                    $repeatersFiles[] = Collection::make($rolesWithFiles)->mapWithKeys(function ($files, $role) use ($locale, $relation, $relationItem) {
+                Collection::make($relatedItemFormFields['files'])->each(function($rolesWithFiles, $locale) use (&$repeatersFiles, $relation, $relationItem) {
+                    $repeatersFiles[] = Collection::make($rolesWithFiles)->mapWithKeys(function($files, $role) use ($locale, $relation, $relationItem) {
                         return [
                             "blocks[$relation-$relationItem->id][$role][$locale]" => $files,
                         ];

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) {

src/Repositories/Behaviors/HandleSlugs.php

Spacing +1 added lines, -1 removed lines

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

src/Repositories/Behaviors/HandleFiles.php

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
         $filesCollection = Collection::make();
         $filesFromFields = $this->getFiles($fields);
 
-        $filesFromFields->each(function ($file) use ($object, $filesCollection) {
+        $filesFromFields->each(function($file) use ($object, $filesCollection) {
             $newFile = File::withTrashed()->find($file['id']);
             $pivot = $newFile->newPivot($object, Arr::except($file, ['id']), 'fileables', true);
             $newFile->setRelation('pivot', $pivot);
@@ -48,7 +48,7 @@ 
 
         $object->files()->sync([]);
 
-        $this->getFiles($fields)->each(function ($file) use ($object) {
+        $this->getFiles($fields)->each(function($file) use ($object) {
             $object->files()->attach($file['id'], Arr::except($file, ['id']));
         });
     }
@@ -74,7 +74,7 @@ 
                 if (in_array($role, $this->model->filesParams ?? [])
                     || in_array($role, config('twill.block_editor.files', []))) {
 
-                    Collection::make($filesForRole)->each(function ($file) use (&$files, $role, $locale) {
+                    Collection::make($filesForRole)->each(function($file) use (&$files, $role, $locale) {
                         $files->push([
                             'id' => $file['id'],
                             'role' => $role,
@@ -99,7 +99,7 @@ 
         if ($object->has('files')) {
             foreach ($object->files->groupBy('pivot.role') as $role => $filesByRole) {
                 foreach ($filesByRole->groupBy('pivot.locale') as $locale => $filesByLocale) {
-                    $fields['files'][$locale][$role] = $filesByLocale->map(function ($file) {
+                    $fields['files'][$locale][$role] = $filesByLocale->map(function($file) {
                         return $file->toCmsArray();
                     });
                 }