area17 / twill

src/Models/Block.php

Spacing +3 added lines, -4 removed lines

@@ -34,8 +34,7 @@ 
     public function scopeEditor($query, $name = 'default')
     {
         return $name === 'default' ?
-            $query->where('editor_name', $name)->orWhereNull('editor_name') :
-            $query->where('editor_name', $name);
+            $query->where('editor_name', $name)->orWhereNull('editor_name') : $query->where('editor_name', $name);
     }
 
     public function blockable()
@@ -85,11 +84,11 @@ 
     {
         $blocks = self::where('parent_id', $this->id)->where('child_key', $editor)->get();
 
-        return $blocks->map(function ($block) use ($blockViewMappings, $renderChilds, $data) {
+        return $blocks->map(function($block) use ($blockViewMappings, $renderChilds, $data) {
                 if ($renderChilds) {
                     $childBlocks = self::where('parent_id', $block->id)->get();
 
-                    $renderedChildViews = $childBlocks->map(function ($childBlock) use ($blockViewMappings, $data) {
+                    $renderedChildViews = $childBlocks->map(function($childBlock) use ($blockViewMappings, $data) {
                         $view = $this->getBlockView($childBlock->type, $blockViewMappings);
                         return view($view, $data)->with('block', $childBlock)->render();
                     })->implode('');

src/Repositories/Behaviors/HandleBlocks.php

Spacing +12 added lines, -12 removed lines

@@ -81,7 +81,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);
         });
     }
@@ -98,7 +98,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);
         });
@@ -216,9 +216,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,
@@ -231,15 +231,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,
                             ];
@@ -250,8 +250,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,
                             ];
@@ -290,7 +290,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) {
             if (Schema::hasTable(config('twill.related_table', 'twill_related')) && $block->getRelated($relation)->isNotEmpty()) {
                 $items = $this->getFormFieldsForRelatedBrowser($block, $relation);
                 foreach ($items as &$item) {
@@ -321,9 +321,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,

Braces +1 added lines, -2 removed lines

@@ -208,8 +208,7 @@
                         $fields['blocks']["blocks-{$block->parent_id}_{$block->child_key}"][] = $blockItem + [
                                 'icon' => $blockTypeConfig['icon'],
                             ];
-                    }
-                    else {
+                    } else {
                         $fields['blocks'][$blockItem['name']][] = $blockItem + [
                                 'icon' => $blockTypeConfig['icon'],
                             ];