area17 / twill

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

Spacing +7 added lines, -7 removed lines

@@ -63,7 +63,7 @@ 
         $relationRepository = $this->getModelRepository($relation, $model);
 
         if (!$keepExisting) {
-            $object->$relation()->each(function ($repeaterElement) {
+            $object->$relation()->each(function($repeaterElement) {
                 $repeaterElement->forceDelete();
             });
         }
@@ -82,8 +82,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) {
@@ -211,8 +211,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,
                             ];
@@ -226,8 +226,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/HandleBlocks.php

Spacing +13 added lines, -13 removed lines

@@ -71,11 +71,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);
             });
@@ -174,9 +174,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,
@@ -189,15 +189,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,
                             ];
@@ -208,8 +208,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,
                             ];
@@ -248,9 +248,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);
@@ -260,9 +260,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']), 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;