thinktomorrow / chief

src/Relations/Relation.php

Spacing +8 added lines, -8 removed lines

@@ -46,7 +46,7 @@ 
             ->orderBy('sort', 'ASC')
             ->get();
 
-        return $relations->map(function (Relation $relation) {
+        return $relations->map(function(Relation $relation) {
             $parent = $relation->parent;
             $parent->relation = $relation;
             return $parent;
@@ -60,14 +60,14 @@ 
                             ->orderBy('sort', 'ASC')
                             ->get();
 
-        return $relations->map(function (Relation $relation) use ($parent_type, $parent_id) {
+        return $relations->map(function(Relation $relation) use ($parent_type, $parent_id) {
 
             // It could be that the child itself is soft-deleted, if this is the case, we will ignore it and move on.
             if (!$child = $relation->child) {
                 if (!$relation->child()->withTrashed()->first()) {
 //                if ((!method_exists($childInstance, 'trashed')) || ! $childInstance->onlyTrashed()->find($relation->child_id)) {
                     // If we cannot retrieve it then he collection type is possibly off, this is a database inconsistency and should be addressed
-                    throw new \DomainException('Corrupt relation reference. Related child ['.$relation->child_type.'@'.$relation->child_id.'] could not be retrieved for parent [' . $parent_type.'@'.$parent_id.']. Make sure the morph key can resolve to a valid class.');
+                    throw new \DomainException('Corrupt relation reference. Related child ['.$relation->child_type.'@'.$relation->child_id.'] could not be retrieved for parent ['.$parent_type.'@'.$parent_id.']. Make sure the morph key can resolve to a valid class.');
                 }
 
                 return null;
@@ -79,7 +79,7 @@ 
         })
 
         // In case of soft-deleted entries, this will be null and should be ignored. We make sure that keys are reset in case of removed child
-        ->reject(function ($child) {
+        ->reject(function($child) {
             return is_null($child);
         })
         ->values();
@@ -96,10 +96,10 @@ 
 
     public static function deleteRelationsOf($type, $id)
     {
-        $relations = static::where(function ($query) use ($type, $id) {
+        $relations = static::where(function($query) use ($type, $id) {
             return $query->where('parent_type', $type)
                          ->where('parent_id', $id);
-        })->orWhere(function ($query) use ($type, $id) {
+        })->orWhere(function($query) use ($type, $id) {
             return $query->where('child_type', $type)
                 ->where('child_id', $id);
         })->get();
@@ -111,7 +111,7 @@ 
 
     public static function deleteAllChildRelationsOf($type, $id)
     {
-        $relations = static::where(function ($query) use ($type, $id) {
+        $relations = static::where(function($query) use ($type, $id) {
             return $query->where('parent_type', $type)
                 ->where('parent_id', $id);
         })->get();
@@ -123,7 +123,7 @@ 
 
     public static function deleteAllParentRelationsOf($type, $id)
     {
-        $relations = static::where(function ($query) use ($type, $id) {
+        $relations = static::where(function($query) use ($type, $id) {
             return $query->where('child_type', $type)
                 ->where('child_id', $id);
         })->get();

src/Sets/Set.php

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
 
         // If no view has been created for this page collection, we try once again to fetch the content value if any. This will silently fail
         // if no content value is present. We don't consider the 'content' attribute to be a default as we do for module.
-        return $this->map(function ($item) {
+        return $this->map(function($item) {
             return ($this->viewParent && $item instanceof ViewableContract)
                 ? $item->setViewParent($this->viewParent)->renderView()
                 : ($item->content ?? '');
@@ -84,7 +84,7 @@ 
     {
         $currentPage = $currentPage ?? request()->get('page', 1);
         $path = request()->path();
-        $items = array_slice($this->all(), ($currentPage - 1) * $perPage);
+        $items = array_slice($this->all(), ($currentPage-1) * $perPage);
 
         return (new \Illuminate\Pagination\Paginator($items, $perPage ?? $this->paginateSetting('perPage', '12'), $currentPage))->setPath($path);
     }
@@ -101,7 +101,7 @@ 
     {
         $currentPage = $currentPage ?? request()->get('page', 1);
         $path = '/'.request()->path();
-        $items = array_slice($this->all(), ($currentPage - 1) * $perPage, $perPage);
+        $items = array_slice($this->all(), ($currentPage-1) * $perPage, $perPage);
 
         return (new \Illuminate\Pagination\LengthAwarePaginator($items, $this->paginateSetting('total', $this->count()), $perPage ?? $this->paginateSetting('perPage', '12'), $currentPage))->setPath($path);
     }

src/Sets/SetReference.php

Spacing +7 added lines, -7 removed lines

@@ -39,7 +39,7 @@ 
     {
         // Constraints
         if (!isset($values['action'])) {
-            throw new \InvalidArgumentException('Set reference array is missing required values for the "action" keys. Given: ' . print_r($values, true));
+            throw new \InvalidArgumentException('Set reference array is missing required values for the "action" keys. Given: '.print_r($values, true));
         }
 
         return new static(
@@ -54,14 +54,14 @@ 
     {
         $sets = config('thinktomorrow.chief.sets', []);
 
-        return collect($sets)->map(function ($set, $key) {
+        return collect($sets)->map(function($set, $key) {
             return SetReference::fromArray($key, $set);
         });
     }
 
     public static function find($key): ?SetReference
     {
-        return static::all()->filter(function ($ref) use ($key) {
+        return static::all()->filter(function($ref) use ($key) {
             return $ref->key() == $key;
         })->first();
     }
@@ -78,13 +78,13 @@ 
 
         $this->validateAction($class, $method);
 
-        $result = call_user_func_array([app($class),$method], $this->parameters($class, $method, $parent));
+        $result = call_user_func_array([app($class), $method], $this->parameters($class, $method, $parent));
 
-        if (! $result instanceof Set && $result instanceof Collection) {
+        if (!$result instanceof Set && $result instanceof Collection) {
             return new Set($result->all(), $this->key);
         }
 
-        if (! $result instanceof Set && $result instanceof Paginator) {
+        if (!$result instanceof Set && $result instanceof Paginator) {
             return new Set($result->all(), $this->key, [
                 'paginate' => [
                     'total' => $result->total(),
@@ -152,7 +152,7 @@ 
 
     private static function validateAction($class, $method)
     {
-        if (! class_exists($class)) {
+        if (!class_exists($class)) {
             throw new \InvalidArgumentException('The class ['.$class.'] isn\'t a valid class reference or does not exist in the chief-settings.sets config entry.');
         }
 

src/Urls/UrlHelper.php

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
      */
     public static function onlineModels(bool $onlySingles = false, Model $ignoredModel = null): Collection
     {
-        $models = chiefMemoize('all-online-models', function () use ($onlySingles) {
+        $models = chiefMemoize('all-online-models', function() use ($onlySingles) {
             $builder = UrlRecord::whereNull('redirect_id')
                 ->select('model_type', 'model_id')
                 ->groupBy('model_type', 'model_id');
@@ -48,17 +48,17 @@ 
                 $builder->where('model_type', 'singles');
             }
 
-            return $builder->get()->mapToGroups(function ($record) {
+            return $builder->get()->mapToGroups(function($record) {
                 return [$record->model_type => $record->model_id];
-            })->map(function ($record, $key) {
+            })->map(function($record, $key) {
                 return Morphables::instance($key)->find($record->toArray());
-            })->map->reject(function ($model) {
+            })->map->reject(function($model) {
                 return is_null($model) || !$model->isPublished(); // Invalid references to archived or removed models where url record still exists.
             })->flatten();
         }, [$onlySingles]);
 
         if ($ignoredModel) {
-            $models = $models->reject(function ($model) use ($ignoredModel) {
+            $models = $models->reject(function($model) use ($ignoredModel) {
                 return (get_class($model) === get_class($ignoredModel) && $model->id === $ignoredModel->id);
             });
         }

src/Media/UploadMedia.php

Spacing +14 added lines, -14 removed lines

@@ -113,7 +113,7 @@ 
         if (isset(json_decode($file)->output)) {
             $image_name = json_decode($file)->output->name;
             $asset      = app(AddAsset::class)->add($model, json_decode($file)->output->image, $type, $locale, $this->sluggifyFilename($image_name));
-        } else {
+        }else {
             if ($file instanceof UploadedFile) {
                 $image_name = $file->getClientOriginalName();
                 $asset      = app(AddAsset::class)->add($model, $file, $type, $locale, $this->sluggifyFilename($image_name));
@@ -121,16 +121,16 @@ 
                 // New files are passed with their filename (instead of their id)
                 // For new files we will replace the filename with the id.
                 if (false !== ($key = array_search($image_name, $files_order))) {
-                    $files_order[$key] = (string) $asset->id;
+                    $files_order[$key] = (string)$asset->id;
                 }
-            }else{
-                try{
+            }else {
+                try {
                     
                     $file   = Asset::find($file);
-                    if(!$file) return;
+                    if (!$file) return;
 
                     $asset  = app(AddAsset::class)->add($model, $file, $type, $locale);
-                }catch(AssetUploadException $e)
+                } catch (AssetUploadException $e)
                 {
                 }
             }
@@ -143,9 +143,9 @@ 
      */
     private function sluggifyFilename($filename): string
     {
-        $extension = substr($filename, strrpos($filename, '.') + 1);
+        $extension = substr($filename, strrpos($filename, '.')+1);
         $filename  = substr($filename, 0, strrpos($filename, '.'));
-        $filename  = Str::slug($filename) . '.' . $extension;
+        $filename  = Str::slug($filename).'.'.$extension;
 
         return $filename;
     }
@@ -161,9 +161,9 @@ 
                 if ($file instanceof UploadedFile && !$file->isValid()) {
                     if ($file->getError() == UPLOAD_ERR_INI_SIZE) {
                         throw new FileTooBigException(
-                            'Cannot upload file because it exceeded the allowed upload_max_filesize: upload_max_filesize is smaller than post size. ' .
-                            'upload_max_filesize: ' . (int)ini_get('upload_max_filesize') . 'MB, ' .
-                            'post_max_size: ' . (int)(ini_get('post_max_size')) . 'MB'
+                            'Cannot upload file because it exceeded the allowed upload_max_filesize: upload_max_filesize is smaller than post size. '.
+                            'upload_max_filesize: '.(int)ini_get('upload_max_filesize').'MB, '.
+                            'post_max_size: '.(int)(ini_get('post_max_size')).'MB'
                         );
                     }
                 }
@@ -177,16 +177,16 @@ 
         foreach ($files_by_type as $type => $files) {
             foreach ($files as $locale => $_files) {
                 if (!in_array($locale, config('translatable.locales'))) {
-                    throw new \InvalidArgumentException('Corrupt file payload. key is expected to be a valid locale [' . implode(',', config('translatable.locales', [])). ']. Instead [' . $locale . '] is given.');
+                    throw new \InvalidArgumentException('Corrupt file payload. key is expected to be a valid locale ['.implode(',', config('translatable.locales', [])).']. Instead ['.$locale.'] is given.');
                 }
 
                 if (!is_array($_files)) {
-                    throw new \InvalidArgumentException('A valid files entry should be an array of files, key with either [new, replace or delete]. Instead a ' . gettype($_files) . ' is given.');
+                    throw new \InvalidArgumentException('A valid files entry should be an array of files, key with either [new, replace or delete]. Instead a '.gettype($_files).' is given.');
                 }
 
                 foreach ($_files as $action => $file) {
                     if (!in_array($action, $actions)) {
-                        throw new \InvalidArgumentException('A valid files entry should have a key of either ['.implode(',', $actions).']. Instead ' . $action . ' is given.');
+                        throw new \InvalidArgumentException('A valid files entry should have a key of either ['.implode(',', $actions).']. Instead '.$action.' is given.');
                     }
                 }
             }