thinktomorrow / chief

src/Site/Urls/MemoizedUrlRecord.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,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;
@@ -44,7 +44,7 @@ 
 
     public static function getByModel(Model $model)
     {
-        return chiefMemoize('url-records-get-by-model', function ($model) {
+        return chiefMemoize('url-records-get-by-model', function($model) {
             return parent::getByModel($model);
         }, [$model]);
     }

src/Site/Urls/Field/UrlSlugFields.php

Spacing +9 added lines, -9 removed lines

@@ -18,14 +18,14 @@ 
 
     public static function redirectsFromModel(ProvidesUrl $model)
     {
-        $records = MemoizedUrlRecord::getByModel($model)->reject(function ($record) {
+        $records = MemoizedUrlRecord::getByModel($model)->reject(function($record) {
             return !$record->isRedirect();
         })->sortByDesc('created_at');
 
         $fields = new static([]);
 
         foreach ($records as $record) {
-            $key = 'redirects-' . $record->locale . '-' . $record->slug;
+            $key = 'redirects-'.$record->locale.'-'.$record->slug;
             $fields[$key] = UrlSlugField::make($key)
                 ->setUrlRecord($record)
                 ->setFullUrl($model->resolveUrl($record->locale, $record->slug));
@@ -60,10 +60,10 @@ 
         $fields = new static([]);
 
         foreach ($locales as $locale) {
-            $fields['url-slugs.' . $locale] = UrlSlugField::make('url-slugs.' . $locale)
+            $fields['url-slugs.'.$locale] = UrlSlugField::make('url-slugs.'.$locale)
                 ->setBaseUrlSegment($model->baseUrlSegment($locale))
-                ->prepend($model->resolveUrl($locale, $model->baseUrlSegment($locale)) . '/')
-                ->name('url-slugs[' . $locale . ']')
+                ->prepend($model->resolveUrl($locale, $model->baseUrlSegment($locale)).'/')
+                ->name('url-slugs['.$locale.']')
                 ->label($locale);
         }
 
@@ -76,19 +76,19 @@ 
      */
     private static function fillWithExistingValues(ProvidesUrl $model, self $fields): void
     {
-        $records = UrlRecord::getByModel($model)->reject(function ($record) {
+        $records = UrlRecord::getByModel($model)->reject(function($record) {
             return $record->isRedirect();
         })->sortBy('locale');
 
         foreach ($records as $record) {
-            if (!isset($fields['url-slugs.' . $record->locale])) {
+            if (!isset($fields['url-slugs.'.$record->locale])) {
                 continue;
             }
 
-            $fields['url-slugs.' . $record->locale]
+            $fields['url-slugs.'.$record->locale]
                 ->setUrlRecord($record)
                 ->setBaseUrlSegment($model->baseUrlSegment($record->locale))
-                ->prepend($model->resolveUrl($record->locale, $model->baseUrlSegment($record->locale)) . '/');
+                ->prepend($model->resolveUrl($record->locale, $model->baseUrlSegment($record->locale)).'/');
         }
     }
 }

src/Site/Urls/Field/Url.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Thinktomorrow\Chief\Site\Urls\Field;
 
@@ -19,9 +19,9 @@ 
 
         // Push update to homepage setting value
         // TODO: we should just fetch the homepages and push that instead...
-        UrlRecord::getByModel($model)->reject(function ($record) {
+        UrlRecord::getByModel($model)->reject(function($record) {
             return ($record->isRedirect() || !$record->isHomepage());
-        })->each(function ($record) {
+        })->each(function($record) {
             app(ChangeHomepage::class)->onUrlChanged($record);
         });
     }

src/Site/Urls/Field/UrlSlugField.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
     {
         return $this->fullUrl
             ? $this->fullUrl
-            : $this->prepend . $this->getValue();
+            : $this->prepend.$this->getValue();
     }
 
     public function setFullUrl(string $fullUrl)
@@ -94,7 +94,7 @@ 
             'baseUrlSegment' => $this->baseUrlSegment,
             'hint'           => null, // Hint placeholder to show url hint when it already exists
             'is_homepage'    => ($this->getValue() === '/'),
-            'show'           => !!$this->getValue(),// show input field or not
+            'show'           => !!$this->getValue(), // show input field or not
         ];
     }
 }

src/Site/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/Site/Urls/ValidationRules/UniqueUrlSlugRule.php

Spacing +1 added lines, -1 removed lines

@@ -60,6 +60,6 @@
      */
     public function message()
     {
-        return 'De \'' . $this->failedDetails['slug'] . '\' link wordt in het ' . $this->failedDetails['locale'] . ' al door een andere pagina gebruikt.';
+        return 'De \''.$this->failedDetails['slug'].'\' link wordt in het '.$this->failedDetails['locale'].' al door een andere pagina gebruikt.';
     }
 }

src/Site/Urls/ProvidesUrl/ProvidingUrl.php

Spacing +1 added lines, -1 removed lines

@@ -35,6 +35,6 @@
     /** @inheritdoc */
     public function baseUrlSegment(string $locale = null): string
     {
-        return BaseUrlSegment::find(isset(static::$baseUrlSegment) ? (array) static::$baseUrlSegment : [], $locale);
+        return BaseUrlSegment::find(isset(static::$baseUrlSegment) ? (array)static::$baseUrlSegment : [], $locale);
     }
 }

src/Site/Urls/ProvidesUrl/BaseUrlSegment.php

Spacing +3 added lines, -3 removed lines

@@ -10,8 +10,8 @@ 
 {
     public static function find(array $segments, string $locale = null)
     {
-        if(count($segments) < 1) return '/';
-        if(count($segments) == 1) return reset($segments);
+        if (count($segments) < 1) return '/';
+        if (count($segments) == 1) return reset($segments);
 
         // Localized value
         if (($key = $locale ?? app()->getlocale()) && isset($segments[$key])) return $segments[$key];
@@ -31,7 +31,7 @@ 
      */
     public static function prepend(ProvidesUrl $model, string $slug, $locale): string
     {
-        $slugWithBaseSegment = $model->baseUrlSegment($locale) . '/' . $slug;
+        $slugWithBaseSegment = $model->baseUrlSegment($locale).'/'.$slug;
         $slugWithBaseSegment = trim($slugWithBaseSegment, '/');
 
         // If slug with base segment is empty string, it means that the passed slug was probably a "/" character.

Braces +12 added lines, -4 removed lines

@@ -10,14 +10,22 @@
 {
     public static function find(array $segments, string $locale = null)
     {
-        if(count($segments) < 1) return '/';
-        if(count($segments) == 1) return reset($segments);
+        if(count($segments) < 1) {
+            return '/';
+        }
+        if(count($segments) == 1) {
+            return reset($segments);
+        }
 
         // Localized value
-        if (($key = $locale ?? app()->getlocale()) && isset($segments[$key])) return $segments[$key];
+        if (($key = $locale ?? app()->getlocale()) && isset($segments[$key])) {
+            return $segments[$key];
+        }
 
         // Fallback localized value
-        if (($fallback_locale = config('app.fallback_locale')) && isset($segments[$fallback_locale])) return $segments[$fallback_locale];
+        if (($fallback_locale = config('app.fallback_locale')) && isset($segments[$fallback_locale])) {
+            return $segments[$fallback_locale];
+        }
 
         // Fallback to first entry
         return reset($segments);

src/Site/Urls/UrlHelper.php

Spacing +5 added lines, -5 removed lines

@@ -89,7 +89,7 @@ 
 
     public static function modelsByType(array $types, Model $ignoredModel = null, bool $online = true)
     {
-        $models = chiefMemoize('all-online-models-' . implode('_', $types), function () use ($types, $online) {
+        $models = chiefMemoize('all-online-models-'.implode('_', $types), function() use ($types, $online) {
             $builder = UrlRecord::whereNull('redirect_id')
                 ->select('model_type', 'model_id')
                 ->groupBy('model_type', 'model_id');
@@ -98,11 +98,11 @@ 
                 $builder->whereIn('model_type', $types);
             }
 
-            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) use ($online) {
+            })->map->reject(function($model) use ($online) {
                 if ($online) {
                     return is_null($model) || (public_method_exists($model, 'isPublished') && !$model->isPublished());
                 } // Invalid references to archived or removed models where url record still exists.
@@ -112,7 +112,7 @@ 
         });
 
         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);
             });
         }