area17 / twill

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

src/Repositories/Behaviors/HandleSlugs.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 
         if (!$item && config('translatable.use_property_fallback', false)
         && config('translatable.fallback_locale') != config('app.locale')) {
-            $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/HandleFieldsGroups.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
             if ($object->$group) {
                 $decoded_fields = json_decode($object->$group, true) ?? [];
                 // In case that some field read the value through $item->$name
-                foreach($decoded_fields as $field_name => $field_value) {
+                foreach ($decoded_fields as $field_name => $field_value) {
                     $object->setAttribute($field_name, $field_value);
                 }
                 $fields = array_merge($fields, $decoded_fields);
@@ -50,7 +50,7 @@ 
 
     protected function handleFieldsGroups($fields) {
         foreach ($this->fieldsGroups as $group => $groupFields) {
-            $fields[$group] = Arr::where(Arr::only($fields, $groupFields), function ($value, $key) {
+            $fields[$group] = Arr::where(Arr::only($fields, $groupFields), function($value, $key) {
                 return !empty($value);
             });
             Arr::forget($fields, $groupFields);

src/RouteServiceProvider.php

Spacing +13 added lines, -13 removed lines

@@ -68,11 +68,11 @@ 
     private function mapHostRoutes($router, $groupOptions, $middlewares, $supportSubdomainRouting)
     {
         if (file_exists(base_path('routes/admin.php'))) {
-            $hostRoutes = function ($router) use ($middlewares) {
+            $hostRoutes = function($router) use ($middlewares) {
                 $router->group([
                     'namespace' => config('twill.namespace', 'App') . '\Http\Controllers\Admin',
                     'middleware' => $middlewares,
-                ], function ($router) {
+                ], function($router) {
                     require base_path('routes/admin.php');
                 });
             };
@@ -91,25 +91,25 @@ 
 
     private function mapInternalRoutes($router, $groupOptions, $middlewares, $supportSubdomainRouting)
     {
-        $internalRoutes = function ($router) use ($middlewares, $supportSubdomainRouting) {
-            $router->group(['middleware' => $middlewares], function ($router) {
+        $internalRoutes = function($router) use ($middlewares, $supportSubdomainRouting) {
+            $router->group(['middleware' => $middlewares], function($router) {
                 require __DIR__ . '/../routes/admin.php';
             });
 
             $router->group([
                 'middleware' => $supportSubdomainRouting ? ['supportSubdomainRouting'] : [],
-            ], function ($router) {
+            ], function($router) {
                 require __DIR__ . '/../routes/auth.php';
             });
 
-            $router->group(['middleware' => $this->app->environment('production') ? ['twill_auth:twill_users'] : []], function ($router) {
+            $router->group(['middleware' => $this->app->environment('production') ? ['twill_auth:twill_users'] : []], function($router) {
                 require __DIR__ . '/../routes/templates.php';
             });
         };
 
         $router->group($groupOptions + [
             'namespace' => $this->namespace . '\Admin',
-        ], function ($router) use ($internalRoutes, $supportSubdomainRouting) {
+        ], function($router) use ($internalRoutes, $supportSubdomainRouting) {
             $router->group([
                 'domain' => config('twill.admin_app_url'),
             ], $internalRoutes);
@@ -127,8 +127,8 @@ 
                 'domain' => config('app.url'),
                 'middleware' => [config('twill.admin_middleware_group', 'web')],
             ],
-                function ($router) {
-                    $router->group(['middleware' => $this->app->environment('production') ? ['twill_auth:twill_users'] : []], function ($router) {
+                function($router) {
+                    $router->group(['middleware' => $this->app->environment('production') ? ['twill_auth:twill_users'] : []], function($router) {
                         require __DIR__ . '/../routes/templates.php';
                     });
                 }
@@ -162,7 +162,7 @@ 
      */
     protected function registerMacros()
     {
-        Route::macro('moduleShowWithPreview', function ($moduleName, $routePrefix = null, $controllerName = null) {
+        Route::macro('moduleShowWithPreview', function($moduleName, $routePrefix = null, $controllerName = null) {
             if ($routePrefix === null) {
                 $routePrefix = $moduleName;
             }
@@ -178,12 +178,12 @@ 
             Route::name($moduleName . '.preview')->get('/admin-preview' . $routePrefix . '{slug}', $controllerName . 'Controller@show')->middleware(['web', 'twill_auth:twill_users', 'can:list']);
         });
 
-        Route::macro('module', function ($slug, $options = [], $resource_options = [], $resource = true) {
+        Route::macro('module', function($slug, $options = [], $resource_options = [], $resource = true) {
 
             $slugs = explode('.', $slug);
             $prefixSlug = str_replace('.', "/", $slug);
             $_slug = Arr::last($slugs);
-            $className = implode("", array_map(function ($s) {
+            $className = implode("", array_map(function($s) {
                 return ucfirst(Str::singular($s));
             }, $slugs));
 
@@ -230,7 +230,7 @@ 
 
             if ($resource) {
                 $customRoutePrefix = !empty($groupPrefix) ? "{$groupPrefix}." : "";
-                Route::group(['as' => $customRoutePrefix], function () use ($slug, $className, $resource_options) {
+                Route::group(['as' => $customRoutePrefix], function() use ($slug, $className, $resource_options) {
                     Route::resource($slug, "{$className}Controller", $resource_options);
                 });
             }