thinktomorrow / chief

src/Media/Application/AbstractMediaFieldHandler.php

Spacing +4 added lines, -4 removed lines

@@ -141,10 +141,10 @@ 
             return $filename;
         }
 
-        $extension = substr($filename, strrpos($filename, '.') + 1);
+        $extension = substr($filename, strrpos($filename, '.')+1);
         $filename = substr($filename, 0, strrpos($filename, '.'));
 
-        return Str::slug($filename) . '.' . $extension;
+        return Str::slug($filename).'.'.$extension;
     }
 
     protected function sort(HasAsset $model, MediaField $field, Request $request)
@@ -170,8 +170,8 @@ 
         $values = isset($fileIdInput[$key])
             ? $fileIdInput[$key]
             : (
-                isset($fileIdInput['files-' . $key])
-                ? $fileIdInput['files-' . $key]
+                isset($fileIdInput['files-'.$key])
+                ? $fileIdInput['files-'.$key]
                 : ''
             );
 

src/Urls/UrlRecord.php

Spacing +6 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
             ->first();
 
         if (!$record) {
-            throw new UrlRecordNotFound('No url record found by slug [' . $slug . '] for locale [' . $locale . '].');
+            throw new UrlRecordNotFound('No url record found by slug ['.$slug.'] for locale ['.$locale.'].');
         }
 
         return $record;
@@ -61,7 +61,7 @@ 
             ->first();
 
         if (!$record) {
-            throw new UrlRecordNotFound('No url record found for model [' . $model->getMorphClass() . '@' . $model->id . '] for locale [' . $locale . '].');
+            throw new UrlRecordNotFound('No url record found for model ['.$model->getMorphClass().'@'.$model->id.'] for locale ['.$locale.'].');
         }
 
         return $record;
@@ -155,7 +155,7 @@ 
         }
 
         if ($ignoredModel) {
-            $builder->whereNotIn('id', function ($query) use ($ignoredModel) {
+            $builder->whereNotIn('id', function($query) use ($ignoredModel) {
                 $query->select('id')
                     ->from('chief_urls')
                     ->where('model_type', '=', $ignoredModel->getMorphClass())
@@ -175,11 +175,11 @@ 
 
         // Filter out offline urls... TODO: this should be a state that is owned by the url and not the model.
         // Because of archived pages the mapping can be null so we reject them before we check for online
-        return $records->map(function (UrlRecord $urlRecord) {
+        return $records->map(function(UrlRecord $urlRecord) {
             return Morphables::instance($urlRecord->model_type)->find($urlRecord->model_id);
-        })->reject(function ($model) {
+        })->reject(function($model) {
             return $model == null;
-        })->reject(function (ProvidesUrl $model) {
+        })->reject(function(ProvidesUrl $model) {
             return (method_exists($model, 'isPublished') && !$model->isPublished());
         });
     }

src/System/Sitemap/SitemapFiles.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     {
         $files = $this->filesystem->files($directory);
 
-        return collect($files)->filter(function ($file) {
+        return collect($files)->filter(function($file) {
             return (Str::startsWith($file->getFileName(), 'sitemap-') && Str::endsWith($file->getFileName(), '.xml'));
         });
     }

src/System/Sitemap/SitemapXml.php

Spacing +4 added lines, -4 removed lines

@@ -76,11 +76,11 @@ 
         $models = UrlRecord::allOnlineModels($locale);
 
         $this->urls = $models
-            ->reject(function (ProvidesUrl $model) use ($locale) {
+            ->reject(function(ProvidesUrl $model) use ($locale) {
                 // In case the url is not found or present for given locale.
                 return !$model->url($locale);
             })
-            ->map(function (ProvidesUrl $model) use ($locale, $alternateLocales) {
+            ->map(function(ProvidesUrl $model) use ($locale, $alternateLocales) {
                 $url = $model->url($locale);
 
                 $alternateUrls = [];
@@ -101,12 +101,12 @@ 
     {
         $pool = new Pool($this->httpClient, $this->crawlableUrlGenerator(), [
             'concurrency' => 5,
-            'fulfilled' => function (Response $response, $index) {
+            'fulfilled' => function(Response $response, $index) {
                 if ($response->getStatusCode() !== \Symfony\Component\HttpFoundation\Response::HTTP_OK) {
                     unset($this->urls[$index]);
                 }
             },
-            'rejected' => function (RequestException $reason, $index) {
+            'rejected' => function(RequestException $reason, $index) {
                 unset($this->urls[$index]);
             },
         ]);

src/Fields/SavingFields.php

Spacing +5 added lines, -5 removed lines

@@ -41,7 +41,7 @@ 
             }
 
             // Custom set methods - default is the generic setField() method.
-            $methodName = 'set' . ucfirst(Str::camel($field->getKey())) . 'Field';
+            $methodName = 'set'.ucfirst(Str::camel($field->getKey())).'Field';
             (method_exists($this, $methodName))
                 ? $this->$methodName($field, $request)
                 : $this->setField($field, $request);
@@ -58,8 +58,8 @@ 
 
     protected function detectCustomSaveMethods(Field $field): bool
     {
-        $saveMethodByKey = 'save' . ucfirst(Str::camel($field->getKey())) . 'Field';
-        $saveMethodByType = 'save' . ucfirst(Str::camel($field->getType()->get())) . 'Fields';
+        $saveMethodByKey = 'save'.ucfirst(Str::camel($field->getKey())).'Field';
+        $saveMethodByType = 'save'.ucfirst(Str::camel($field->getType()->get())).'Fields';
 
         foreach ([$saveMethodByKey, $saveMethodByType] as $saveMethod) {
             foreach ($this->assistants() as $assistant) {
@@ -107,7 +107,7 @@ 
 
             // Make our media fields able to be translatable as well...
             if ($field->ofType(FieldType::FILE, FieldType::IMAGE)) {
-                throw new \Exception('Cannot process the ' . $field->getKey() . ' media field. Currently no support for translatable media files. We should fix this!');
+                throw new \Exception('Cannot process the '.$field->getKey().' media field. Currently no support for translatable media files. We should fix this!');
             }
 
             // Okay so this is a bit odd but since all translations are expected to be inside the trans
@@ -160,6 +160,6 @@ 
 
     public function saveImageFields(ImageField $field, Request $request)
     {
-        app(ImageFieldHandler::class)->handle($this->model, $field, $request->input('images.' . $field->getName(), []), $request);
+        app(ImageFieldHandler::class)->handle($this->model, $field, $request->input('images.'.$field->getName(), []), $request);
     }
 }

src/Relations/AvailableChildren.php

Spacing +6 added lines, -6 removed lines

@@ -36,7 +36,7 @@ 
 
     public function onlyModules(): Collection
     {
-        return $this->collection()->reject(function ($item) {
+        return $this->collection()->reject(function($item) {
             if ($item instanceof Page || $item instanceof StoredSetReference) {
                 return true;
             }
@@ -45,7 +45,7 @@ 
 
     public function onlyPages(): Collection
     {
-        return $this->collection()->filter(function ($item) {
+        return $this->collection()->filter(function($item) {
             if ($item instanceof Page) {
                 return true;
             }
@@ -75,12 +75,12 @@ 
 
         // Merging the results of all the pages and all the modules, then filter by the config
         // This prevents us from having duplicates and also reduces the query load.
-        $collection = $collection->filter(function ($page) use ($available_children_types) {
+        $collection = $collection->filter(function($page) use ($available_children_types) {
             return in_array(get_class($page), $available_children_types);
         });
 
         // Filter out our already loaded pages and modules
-        $remaining_children_types = collect($available_children_types)->reject(function ($type) {
+        $remaining_children_types = collect($available_children_types)->reject(function($type) {
             return (new $type() instanceof Page || new $type() instanceof Module);
         });
 
@@ -92,12 +92,12 @@ 
         }
 
         // Remove duplicate models
-        $collection = $collection->unique(function ($model) {
+        $collection = $collection->unique(function($model) {
             return (new FlatReference(get_class($model), $model->id))->get();
         });
 
         // Filter out our parent
-        return $this->collection = $collection->reject(function ($item) {
+        return $this->collection = $collection->reject(function($item) {
             if ($item instanceof $this->parent) {
                 return $item->id == $this->parent->id;
             }

src/Settings/SettingFieldsManager.php

Spacing +2 added lines, -2 removed lines

@@ -51,8 +51,8 @@
 
     public function editFields(): Fields
     {
-        return $this->fields()->map(function (Field $field) {
-            return $field->valueResolver(function ($model = null, $locale = null, $field) {
+        return $this->fields()->map(function(Field $field) {
+            return $field->valueResolver(function($model = null, $locale = null, $field) {
                 return $this->settings->get($field->getKey(), $locale);
             });
         });

src/Fragments/HasFragments.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
         ], $fragment->getValues());
 
         if ($fragment->hasModelId()) {
-            $model =FragmentModel::find($fragment->getModelId());
+            $model = FragmentModel::find($fragment->getModelId());
             $model->update($values);
 
             return $model->id;

src/Fragments/FragmentField.php

Indentation +16 added lines, -16 removed lines

@@ -63,22 +63,22 @@
                 ->setModelIdInputName($this->name . '[' . $k . '][modelId]')
                 ->setFields($this->fields->clone()->map(function (Field $field) use ($k, $fragment) {
                     return $field->name($this->name . '.' . $k . '.' . $field->getName())
-                                 ->localizedFormat(':name.:locale')
-                                 ->valueResolver(function ($model = null, $locale = null, $field) use ($fragment) {
-                                     if (isset($field->value)) {
-                                         return $field->value;
-                                     }
-
-                                     if ($field instanceof MediaField) {
-                                         if (!$fragment->hasModelId()) {
-                                             return [];
-                                         }
-
-                                         return $field->getMedia(FragmentModel::find($fragment->getModelId()), $locale);
-                                     }
-
-                                     return $fragment->getValue($field->getColumn(), $locale);
-                                 });
+                                    ->localizedFormat(':name.:locale')
+                                    ->valueResolver(function ($model = null, $locale = null, $field) use ($fragment) {
+                                        if (isset($field->value)) {
+                                            return $field->value;
+                                        }
+
+                                        if ($field instanceof MediaField) {
+                                            if (!$fragment->hasModelId()) {
+                                                return [];
+                                            }
+
+                                            return $field->getMedia(FragmentModel::find($fragment->getModelId()), $locale);
+                                        }
+
+                                        return $fragment->getValue($field->getColumn(), $locale);
+                                    });
                 }));
         }
 

Spacing +8 added lines, -8 removed lines

@@ -48,11 +48,11 @@ 
         // Model is auto-injected by Manager::editFields() method.
         if (($this->model)) {
             if (!method_exists($this->model, 'getFragments')) {
-                throw new \RuntimeException(get_class($this->model) . ' is missing the ' . HasFragments::class . ' trait.');
+                throw new \RuntimeException(get_class($this->model).' is missing the '.HasFragments::class.' trait.');
             }
 
             if (count($modelFragments = $this->model->getFragments($this->getKey())) > 0) {
-                $fragments = $modelFragments->map(function (FragmentModel $fragmentModel) {
+                $fragments = $modelFragments->map(function(FragmentModel $fragmentModel) {
                     return Fragment::fromModel($fragmentModel);
                 })->all();
             }
@@ -60,11 +60,11 @@ 
 
         foreach ($fragments as $k => $fragment) {
             $fragments[$k] = $fragments[$k]
-                ->setModelIdInputName($this->name . '[' . $k . '][modelId]')
-                ->setFields($this->fields->clone()->map(function (Field $field) use ($k, $fragment) {
-                    return $field->name($this->name . '.' . $k . '.' . $field->getName())
+                ->setModelIdInputName($this->name.'['.$k.'][modelId]')
+                ->setFields($this->fields->clone()->map(function(Field $field) use ($k, $fragment) {
+                    return $field->name($this->name.'.'.$k.'.'.$field->getName())
                                  ->localizedFormat(':name.:locale')
-                                 ->valueResolver(function ($model = null, $locale = null, $field) use ($fragment) {
+                                 ->valueResolver(function($model = null, $locale = null, $field) use ($fragment) {
                                      if (isset($field->value)) {
                                          return $field->value;
                                      }
@@ -110,8 +110,8 @@ 
         }
 
         // Take the fields from the first fragment as a starting point for duplication
-        return array_map(function (\Thinktomorrow\Chief\Fields\Types\Field $field) {
-            return $field->valueResolver(function ($model = null, $locale = null, $field) {
+        return array_map(function(\Thinktomorrow\Chief\Fields\Types\Field $field) {
+            return $field->valueResolver(function($model = null, $locale = null, $field) {
                 if ($field instanceof \Thinktomorrow\Chief\Fields\Types\MediaField) {
                     return [];
                 }