area17 / twill

src/Helpers/i18n_helpers.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
     {
         $manageMultipleLanguages = count(getLocales()) > 1;
         if ($manageMultipleLanguages && $translate) {
-            $allLanguages = Collection::make(config('translatable.locales'))->map(function ($locale, $index) use ($form_fields) {
+            $allLanguages = Collection::make(config('translatable.locales'))->map(function($locale, $index) use ($form_fields) {
                 return [
                     'shortlabel' => strtoupper($locale),
                     'label' => getLanguageLabelFromLocaleCode($locale),
@@ -388,6 +388,6 @@ 
                 ],
         ];
 
-        return $codeToLanguageMappings[$code]['native_name'] ?? $code ;
+        return $codeToLanguageMappings[$code]['native_name'] ?? $code;
     }
 }

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) {
             foreach ($value as $block) {
                 $cmsBlock = $this->app->make(BlockRepository::class)->buildFromCmsArray($block, false);
 

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']), config('twill.mediables_table', 'twill_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/BlockRepository.php

Spacing +5 added lines, -5 removed lines

@@ -45,8 +45,8 @@ 
         if (Schema::hasTable(config('twill.related_table', 'twill_related'))) {
             $relatedItems = Collection::make();
 
-            Collection::make($fields['browsers'])->each(function ($items, $browserName) use ($object, &$relatedItems) {
-                Collection::make($items)->each(function ($item) use ($browserName, &$relatedItems) {
+            Collection::make($fields['browsers'])->each(function($items, $browserName) use ($object, &$relatedItems) {
+                Collection::make($items)->each(function($item) use ($browserName, &$relatedItems) {
                     try {
                         $repository = $this->getModelRepository($item['endpointType'] ?? $browserName);
                         $relatedItems->push((object) [
@@ -74,7 +74,7 @@ 
     {
         if (Schema::hasTable(config('twill.related_table', 'twill_related'))) {
             if (isset($fields['browsers'])) {
-                Collection::make($fields['browsers'])->each(function ($items, $browserName) use ($object) {
+                Collection::make($fields['browsers'])->each(function($items, $browserName) use ($object) {
                     $object->saveRelated($items, $browserName);
                 });
             }
@@ -102,14 +102,14 @@ 
     {
         $blocksFromConfig = $this->config->get('twill.block_editor.' . ($repeater ? 'repeaters' : 'blocks'));
 
-        $block['type'] = Collection::make($blocksFromConfig)->search(function ($blockConfig) use ($block) {
+        $block['type'] = Collection::make($blocksFromConfig)->search(function($blockConfig) use ($block) {
             return $blockConfig['component'] === $block['type'];
         });
 
         $block['content'] = empty($block['content']) ? new \stdClass : (object) $block['content'];
 
         if ($block['browsers']) {
-            $browsers = Collection::make($block['browsers'])->map(function ($items) {
+            $browsers = Collection::make($block['browsers'])->map(function($items) {
                 return Collection::make($items)->pluck('id');
             })->toArray();
 

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

Spacing +13 added lines, -13 removed lines

@@ -70,7 +70,7 @@ 
         $blockRepository = app(BlockRepository::class);
 
         $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) {
             $this->createBlock($blockRepository, $block);
         });
     }
@@ -88,7 +88,7 @@ 
         $blockCreated = $blockRepository->create($blockFields);
 
         // Handle child blocks
-        $blockFields['blocks']->each(function ($childBlock) use ($blockCreated, $blockRepository) {
+        $blockFields['blocks']->each(function($childBlock) use ($blockCreated, $blockRepository) {
             $childBlock['parent_id'] = $blockCreated->id;
             $this->createBlock($blockRepository, $childBlock);
         });
@@ -200,9 +200,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,
@@ -215,15 +215,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,
                             ];
@@ -234,8 +234,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,
                             ];
@@ -274,9 +274,9 @@ 
      */
     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) {
             if (Schema::hasTable(config('twill.related_table', 'twill_related')) && $block->getRelated($relation)->isNotEmpty()) {
-                $items = $this->getFormFieldsForRelatedBrowser($block, $relation);;
+                $items = $this->getFormFieldsForRelatedBrowser($block, $relation); ;
             } else {
                 $relationRepository = $this->getModelRepository($relation);
                 $relatedItems = $relationRepository->get([], ['id' => $ids], [], -1);
@@ -286,9 +286,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/HandleRepeaters.php

Spacing +8 added lines, -8 removed lines

@@ -62,7 +62,7 @@ 
         $relationRepository = $this->getModelRepository($relation, $model);
 
         if (!$keepExisting) {
-            $object->$relation()->each(function ($repeaterElement) {
+            $object->$relation()->each(function($repeaterElement) {
                 $repeaterElement->forceDelete();
             });
         }
@@ -81,8 +81,8 @@ 
 
         $morph = $morph ?: $relation;
 
-        $morphFieldType = $morph.'_type';
-        $morphFieldId = $morph.'_id';
+        $morphFieldType = $morph . '_type';
+        $morphFieldId = $morph . '_id';
 
         // if no relation field submitted, soft deletes all associated rows
         if (!$relationFields) {
@@ -232,8 +232,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,
                             ];
@@ -247,8 +247,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,
                         ];
@@ -298,7 +298,7 @@ 
      */
     protected function getRepeaters()
     {
-        return collect($this->repeaters)->map(function ($repeater, $key) {
+        return collect($this->repeaters)->map(function($repeater, $key) {
             $repeaterName = is_string($repeater) ? $repeater : $key;
             return [
                 'relation' => !empty($repeater['relation']) ? $repeater['relation'] : $this->inferRelationFromRepeaterName($repeaterName),

src/Repositories/Behaviors/HandleBrowsers.php

Indentation +5 added lines, -5 removed lines

@@ -142,11 +142,11 @@
     }
 
         /**
-     * Get all browser' detail info from the $browsers attribute. 
-     * The missing information will be inferred by convention of Twill.
-     *
-     * @return Illuminate\Support\Collection
-     */
+         * Get all browser' detail info from the $browsers attribute. 
+         * The missing information will be inferred by convention of Twill.
+         *
+         * @return Illuminate\Support\Collection
+         */
     protected function getBrowsers()
     {
         return collect($this->browsers)->map(function ($browser, $key) {

Spacing +4 added lines, -4 removed lines

@@ -107,7 +107,7 @@ 
      */
     public function getFormFieldsForBrowser($object, $relation, $routePrefix = null, $titleKey = 'title', $moduleName = null)
     {
-        return $object->$relation->map(function ($relatedElement) use ($titleKey, $routePrefix, $relation, $moduleName) {
+        return $object->$relation->map(function($relatedElement) use ($titleKey, $routePrefix, $relation, $moduleName) {
             return [
                 'id' => $relatedElement->id,
                 'name' => $relatedElement->titleInBrowser ?? $relatedElement->$titleKey,
@@ -126,7 +126,7 @@ 
      */
     public function getFormFieldsForRelatedBrowser($object, $relation)
     {
-        return $object->getRelated($relation)->map(function ($relatedElement) {
+        return $object->getRelated($relation)->map(function($relatedElement) {
             return ($relatedElement != null) ? [
                 'id' => $relatedElement->id,
                 'name' => $relatedElement->titleInBrowser ?? $relatedElement->title,
@@ -136,7 +136,7 @@ 
             ]) + (classHasTrait($relatedElement, HasMedias::class) ? [
                 'thumbnail' => $relatedElement->defaultCmsImage(['w' => 100, 'h' => 100]),
             ] : []) : [];
-        })->reject(function ($item) {
+        })->reject(function($item) {
             return empty($item);
         })->values()->toArray();
     }
@@ -149,7 +149,7 @@ 
      */
     protected function getBrowsers()
     {
-        return collect($this->browsers)->map(function ($browser, $key) {
+        return collect($this->browsers)->map(function($browser, $key) {
             $browserName = is_string($browser) ? $browser : $key;
             return [
                 'relation' => !empty($browser['relation']) ? $browser['relation'] : $this->inferRelationFromBrowserName($browserName),