thinktomorrow / chief

src/Urls/UrlRecord.php

Indentation +5 added lines, -5 removed lines

@@ -65,8 +65,8 @@ 
     public static function getByModel(Model $model)
     {
         return static::where('model_type', $model->getMorphClass())
-                     ->where('model_id', $model->id)
-                     ->get();
+                        ->where('model_id', $model->id)
+                        ->get();
     }
 
     public static function findRecentRedirect(Model $model, string $locale): ?self
@@ -134,9 +134,9 @@ 
         if ($ignoredModel) {
             $builder->whereNotIn('id', function ($query) use ($ignoredModel) {
                 $query->select('id')
-                      ->from('chief_urls')
-                      ->where('model_type', '=', $ignoredModel->getMorphClass())
-                      ->where('model_id', '=', $ignoredModel->id);
+                        ->from('chief_urls')
+                        ->where('model_type', '=', $ignoredModel->getMorphClass())
+                        ->where('model_id', '=', $ignoredModel->id);
             });
         }
 

Spacing +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
         return static::where('model_type', $model->getMorphClass())
             ->where('model_id', $model->id)
             ->where('locale', $locale)
-            ->where('redirect_id','<>', null)
+            ->where('redirect_id', '<>', null)
             ->orderBy('redirect_id', 'ASC')
             ->first();
     }
@@ -127,12 +127,12 @@ 
             $builder->where('locale', $locale);
         }
 
-        if (! $includeRedirects) {
+        if (!$includeRedirects) {
             $builder->whereNull('redirect_id');
         }
 
         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())

src/Urls/Application/SaveUrlSlugs.php

Spacing +9 added lines, -9 removed lines

@@ -56,7 +56,7 @@ 
     private function saveRecord(string $locale, ?string $slug)
     {
         // Existing ones for this locale?
-        $nonRedirectsWithSameLocale = $this->existingRecords->filter(function ($record) use ($locale) {
+        $nonRedirectsWithSameLocale = $this->existingRecords->filter(function($record) use ($locale) {
             return (
                 $record->locale == $locale &&
                 !$record->isRedirect()
@@ -65,7 +65,7 @@ 
 
         // If slug entry is left empty, all existing records will be deleted
         if (!$slug) {
-            $nonRedirectsWithSameLocale->each(function ($existingRecord) {
+            $nonRedirectsWithSameLocale->each(function($existingRecord) {
                 $existingRecord->delete();
             });
 
@@ -81,7 +81,7 @@ 
         }
 
         // Only replace the existing records that differ from the current passed slugs
-        $nonRedirectsWithSameLocale->each(function ($existingRecord) use ($slug) {
+        $nonRedirectsWithSameLocale->each(function($existingRecord) use ($slug) {
             if ($existingRecord->slug != $slug) {
                 $existingRecord->replaceAndRedirect(['slug' => $slug]);
             }
@@ -126,12 +126,12 @@ 
      */
     private function deleteIdenticalRedirects($existingRecords, $locale, $slug): void
     {
-        $existingRecords->filter(function ($record) use ($locale) {
+        $existingRecords->filter(function($record) use ($locale) {
             return (
                 $record->locale == $locale &&
                 $record->isRedirect()
             );
-        })->each(function ($existingRecord) use ($slug) {
+        })->each(function($existingRecord) use ($slug) {
             if ($existingRecord->slug == $slug) {
                 $existingRecord->delete();
             }
@@ -140,15 +140,15 @@ 
 
     private function deleteIdenticalRecords($existingRecords): void
     {
-        if($this->strict) return;
+        if ($this->strict) return;
 
         // The old homepage url should be removed since this is no longer in effect.
         // In case of any redirect to this old homepage, the last used redirect is now back in effect.
-        $existingRecords->reject(function($existingRecord){
+        $existingRecords->reject(function($existingRecord) {
             return (
                 $existingRecord->model_type == $this->model->getMorphClass() &&
                 $existingRecord->model_id == $this->model->id);
-        })->each(function($existingRecord){
+        })->each(function($existingRecord) {
 
             // TODO: if there is a redirect to this page, we'll take this one as the new url
             $existingRecord->delete();
@@ -162,7 +162,7 @@ 
      */
     private function prependBaseUrlSegment(string $slug, $locale): string
     {
-        $slugWithBaseSegment = $this->model->baseUrlSegment($locale) . '/' . $slug;
+        $slugWithBaseSegment = $this->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 +3 added lines, -1 removed lines

@@ -140,7 +140,9 @@
 
     private function deleteIdenticalRecords($existingRecords): void
     {
-        if($this->strict) return;
+        if($this->strict) {
+            return;
+        }
 
         // The old homepage url should be removed since this is no longer in effect.
         // In case of any redirect to this old homepage, the last used redirect is now back in effect.

src/Urls/Application/RevertUrlSlug.php

Spacing +3 added lines, -3 removed lines

@@ -23,10 +23,10 @@ 
 
     public function handle(string $locale): void
     {
-        try{
+        try {
             $currentUrlRecord = UrlRecord::findByModel($this->model, $locale);
 
-            if($recentRedirect = UrlRecord::findRecentRedirect($this->model, $locale)){
+            if ($recentRedirect = UrlRecord::findRecentRedirect($this->model, $locale)) {
 
                 $recentRedirectSlug = $recentRedirect->slug;
                 $recentRedirect->delete();
@@ -34,7 +34,7 @@ 
                 $currentUrlRecord->replaceAndRedirect(['slug' => $recentRedirectSlug]);
             }
         }
-        catch(UrlRecordNotFound $e)
+        catch (UrlRecordNotFound $e)
         {
             // No url present so nothing to do here...
         }

Braces +1 added lines, -2 removed lines

@@ -33,8 +33,7 @@
 
                 $currentUrlRecord->replaceAndRedirect(['slug' => $recentRedirectSlug]);
             }
-        }
-        catch(UrlRecordNotFound $e)
+        } catch(UrlRecordNotFound $e)
         {
             // No url present so nothing to do here...
         }

src/Urls/UrlHelper.php

Spacing +4 added lines, -4 removed lines

@@ -15,11 +15,11 @@ 
      */
     public static function allOnlineModels(bool $onlySingles = false): array
     {
-        return chiefMemoize('all-online-models', function () use($onlySingles) {
+        return chiefMemoize('all-online-models', function() use($onlySingles) {
 
             $builder = UrlRecord::whereNull('redirect_id')->select('model_type', 'model_id')->groupBy('model_type', 'model_id');
 
-            if($onlySingles) {
+            if ($onlySingles) {
                 $builder->where('model_type', 'singles');
             }
 
@@ -28,9 +28,9 @@ 
             });
 
             // Get model for each of these records...
-            $models = $liveUrlRecords->map(function($record, $key){
+            $models = $liveUrlRecords->map(function($record, $key) {
                 return Morphables::instance($key)->find($record->toArray());
-            })->each->reject(function ($model) {
+            })->each->reject(function($model) {
                 // Invalid references to archived or removed models where url record still exists.
                 return is_null($model);
             })->flatten();

src/Urls/UrlSlugFields.php

Spacing +7 added lines, -7 removed lines

@@ -18,7 +18,7 @@ 
 
     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');
 
@@ -29,7 +29,7 @@ 
             $fields[$key] = UrlSlugField::make($key)
                 ->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)).'/');
         }
 
         return $fields;
@@ -61,10 +61,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);
         }
 
@@ -77,7 +77,7 @@ 
      */
     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');
 
@@ -89,7 +89,7 @@ 
             $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/Management/Assistants/UrlAssistant.php

Spacing +6 added lines, -6 removed lines

@@ -25,10 +25,10 @@ 
 
     public function manager(Manager $manager)
     {
-        $this->manager  = $manager;
+        $this->manager = $manager;
 
-        if (! $manager->model() instanceof ProvidesUrl) {
-            throw new \Exception('UrlAssistant requires the model interfaced by ' . ProvidesUrl::class . '.');
+        if (!$manager->model() instanceof ProvidesUrl) {
+            throw new \Exception('UrlAssistant requires the model interfaced by '.ProvidesUrl::class.'.');
         }
 
         $this->model = $manager->model();
@@ -56,14 +56,14 @@ 
             InputField::make('url-slugs')
                 ->validation(
                     [
-                        'url-slugs' => ['array', 'min:1', new UniqueUrlSlugRule(($this->model && $this->model->exists) ? $this->model : null),],
+                        'url-slugs' => ['array', 'min:1', new UniqueUrlSlugRule(($this->model && $this->model->exists) ? $this->model : null), ],
                     ],
                     [],
                     [
                         'url-slugs.*' => 'taalspecifieke link',
                     ])
                 ->view('chief::back._fields.url-slugs')
-                ->viewData(['fields' => UrlSlugFields::fromModel($this->model) ]),
+                ->viewData(['fields' => UrlSlugFields::fromModel($this->model)]),
         ]);
     }
 
@@ -75,7 +75,7 @@ 
         // TODO: we should just fetch the homepages and push that instead...
         UrlRecord::getByModel($this->model)->reject(function($record) {
             return ($record->isRedirect() || !$record->isHomepage());
-        })->each(function($record){
+        })->each(function($record) {
             app(ChangeHomepage::class)->onUrlChanged($record);
         });
     }

src/Pages/PageManager.php

Spacing +8 added lines, -8 removed lines

@@ -61,15 +61,15 @@ 
     {
         $permission = 'update-page';
 
-        if (in_array($verb, ['index','show'])) {
+        if (in_array($verb, ['index', 'show'])) {
             $permission = 'view-page';
-        } elseif (in_array($verb, ['create','store'])) {
+        } elseif (in_array($verb, ['create', 'store'])) {
             $permission = 'create-page';
         } elseif (in_array($verb, ['delete'])) {
             $permission = 'delete-page';
         }
 
-        if (! auth()->guard('chief')->user()->hasPermissionTo($permission)) {
+        if (!auth()->guard('chief')->user()->hasPermissionTo($permission)) {
             throw NotAllowedManagerRoute::notAllowedPermission($permission, $this);
         }
     }
@@ -130,7 +130,7 @@ 
     public function fieldArrangement($key = null): FieldArrangement
     {
         if ($key == 'create') {
-            return new FieldArrangement($this->fieldsWithAssistantFields()->filterBy(function ($field) {
+            return new FieldArrangement($this->fieldsWithAssistantFields()->filterBy(function($field) {
                 return in_array($field->key, ['title']);
             }));
         }
@@ -152,8 +152,8 @@ 
         if ($this->model->id) {
             return parent::details()
                 ->set('title', $this->model->title)
-                ->set('intro', 'Aangepast ' . $this->model->updated_at->format('d/m/Y H:i'))
-                ->set('context', '<span class="inline-s">' . $this->assistant('publish')->publicationStatusAsLabel() . '</span>');
+                ->set('intro', 'Aangepast '.$this->model->updated_at->format('d/m/Y H:i'))
+                ->set('context', '<span class="inline-s">'.$this->assistant('publish')->publicationStatusAsLabel().'</span>');
         }
 
         return parent::details();
@@ -162,7 +162,7 @@ 
     public function saveFields(Request $request)
     {
         // Store the morph_key upon creation
-        if ($this->model instanceof MorphableContract && ! $this->model->morph_key) {
+        if ($this->model instanceof MorphableContract && !$this->model->morph_key) {
             $this->model->morph_key = $this->model->morphKey();
         }
 
@@ -207,7 +207,7 @@ 
             if (is_array_empty($translation)) {
 
                 // Nullify all values
-                $trans[$locale] = array_map(function ($value) {
+                $trans[$locale] = array_map(function($value) {
                     return null;
                 }, $translation);
                 continue;

src/Settings/Application/ChangeHomepage.php

Spacing +4 added lines, -4 removed lines

@@ -28,13 +28,13 @@ 
 //            }
 //        }
 
-        foreach($flatReferences as $locale => $flatReferenceString) {
+        foreach ($flatReferences as $locale => $flatReferenceString) {
 
-            if(!$flatReferenceString) {
+            if (!$flatReferenceString) {
 
 // TODO: when empty we'll remove the entry, we'll also want to revert to last redirect.
 
-                if(isset($existingValues[$locale])) {
+                if (isset($existingValues[$locale])) {
                     $flatReferenceInstance = FlatReferenceFactory::fromString(($existingValues[$locale]));
                     (new RevertUrlSlug($flatReferenceInstance->instance()))->handle($locale);
 
@@ -53,7 +53,7 @@ 
     {
         $model = Morphables::instance($urlRecord->model_type)->find($urlRecord->model_id);
 
-        if(!$homepage = Setting::findByKey(Setting::HOMEPAGE)){
+        if (!$homepage = Setting::findByKey(Setting::HOMEPAGE)) {
             $homepage = Setting::create(['key' => Setting::HOMEPAGE, 'value' => []]);
         }
 

src/Settings/SettingFieldsManager.php

Spacing +4 added lines, -4 removed lines

@@ -57,9 +57,9 @@ 
     {
         $existingHomepageValue = [];
 
-        foreach($this->fields() as $key => $field)
+        foreach ($this->fields() as $key => $field)
         {
-            if(!$setting = Setting::where('key', $key)->first()) {
+            if (!$setting = Setting::where('key', $key)->first()) {
                 Setting::create([
                     'key' => $key,
                     'value' => $request->get($key, ''),
@@ -68,7 +68,7 @@ 
                 continue;
             }
 
-            if($key === Setting::HOMEPAGE) {
+            if ($key === Setting::HOMEPAGE) {
                 $existingHomepageValue = $setting->value;
             }
 
@@ -76,7 +76,7 @@ 
         }
 
         // A changed homepage needs to be reflected in the urls as well in order to respond to incoming requests.
-        if($request->filled(Setting::HOMEPAGE)) {
+        if ($request->filled(Setting::HOMEPAGE)) {
             app(ChangeHomepage::class)->onSettingChanged($existingHomepageValue);
         }
     }