thinktomorrow / chief

src/Urls/UrlRecord.php

Spacing +7 added lines, -7 removed lines

@@ -22,14 +22,14 @@ 
     public static function findBySlug(string $slug, string $locale): UrlRecord
     {
         // Clear the input from any trailing slashes.
-        if($slug != '/'){ $slug = trim($slug,'/'); }
+        if ($slug != '/') { $slug = trim($slug, '/'); }
 
         $record = static::where('slug', $slug)
                         ->where('locale', $locale)
                         ->orderBy('redirect_id', 'ASC')
                         ->first();
 
-        if(!$record){
+        if (!$record) {
             throw new UrlRecordNotFound('No url record found by slug ['.$slug.'] for locale ['.$locale.'].');
         }
 
@@ -53,7 +53,7 @@ 
             ->orderBy('redirect_id', 'ASC')
             ->first();
 
-        if(!$record){
+        if (!$record) {
             throw new UrlRecordNotFound('No url record found for model ['.$model->getMorphClass().'@'.$model->id.'] for locale ['.$locale.'].');
         }
 
@@ -82,7 +82,7 @@ 
 
     public function redirectTo(self $record = null): ?UrlRecord
     {
-        if(!$record){
+        if (!$record) {
             return $this->isRedirect() ? static::find($this->redirect_id) : null;
         }
 
@@ -106,15 +106,15 @@ 
     {
         $builder = static::where('slug', $slug);
 
-        if($locale) {
+        if ($locale) {
             $builder->where('locale', $locale);
         }
 
-        if( ! $includeRedirects){
+        if (!$includeRedirects) {
             $builder->whereNull('redirect_id');
         }
 
-        if($ignoredModel){
+        if ($ignoredModel) {
             $builder->whereNotIn('id', function($query) use($ignoredModel){
                 $query->select('id')
                       ->from('chief_urls')

src/Urls/SaveUrlSlugs.php

Spacing +11 added lines, -11 removed lines

@@ -21,9 +21,9 @@ 
     {
         $this->existingRecords = UrlRecord::getByModel($this->model);
 
-        foreach($slugs as $locale => $slug){
+        foreach ($slugs as $locale => $slug) {
 
-            if(!$slug){
+            if (!$slug) {
                 $this->deleteRecord($locale);
                 continue;
             }
@@ -52,21 +52,21 @@ 
         $this->deleteIdenticalRedirects($this->existingRecords, $locale, $slug);
 
         // Also delete any redirects that match this locale and slug but are related to another model
-        $this->deleteIdenticalRedirects(UrlRecord::where('slug',$slug)->where('locale',$locale)->get(), $locale, $slug);
+        $this->deleteIdenticalRedirects(UrlRecord::where('slug', $slug)->where('locale', $locale)->get(), $locale, $slug);
 
         // If slug entry is left empty, all existing records will be deleted
-        if(!$slug){
-            $nonRedirectsWithSameLocale->each(function($existingRecord){
+        if (!$slug) {
+            $nonRedirectsWithSameLocale->each(function($existingRecord) {
                 $existingRecord->delete();
             });
         }
-        elseif($nonRedirectsWithSameLocale->isEmpty()){
+        elseif ($nonRedirectsWithSameLocale->isEmpty()) {
             $this->createRecord($locale, $slug);
         }
-        else{
+        else {
             // Only replace the existing records that differ from the current passed slugs
             $nonRedirectsWithSameLocale->each(function($existingRecord) use($slug){
-                if($existingRecord->slug != $slug){
+                if ($existingRecord->slug != $slug) {
                     $existingRecord->replaceAndRedirect(['slug' => $slug]);
                 }
             });
@@ -90,12 +90,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();
             }
@@ -109,7 +109,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.

src/Urls/UrlSlugFields.php

Spacing +8 added lines, -8 removed lines

@@ -25,7 +25,7 @@ 
     {
         $array = [];
 
-        foreach($this->all() as $field) {
+        foreach ($this->all() as $field) {
             $array[] = $field->toArray();
         }
 
@@ -42,11 +42,11 @@ 
         $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 . ']')
-                                                ->label($locale . ' link');
+                                                ->prepend($model->resolveUrl($locale, $model->baseUrlSegment($locale)).'/')
+                                                ->name('url-slugs['.$locale.']')
+                                                ->label($locale.' link');
         }
 
         return $fields;
@@ -58,18 +58,18 @@ 
      */
     private static function fillWithExistingValues(ProvidesUrl $model, self $fields): void
     {
-        $records = MemoizedUrlRecord::getByModel($model)->reject(function ($record) {
+        $records = MemoizedUrlRecord::getByModel($model)->reject(function($record) {
             return $record->isRedirect();
         })->sortBy('locale');
 
         foreach ($records as $record) {
 
-            if(!isset($fields['url-slugs.'.$record->locale])) continue;
+            if (!isset($fields['url-slugs.'.$record->locale])) continue;
 
             $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)).'/');
         }
     }
 }
\ No newline at end of file

src/Urls/ValidationRules/UniqueUrlSlugRule.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
      */
     public function passes($attribute, $slugs)
     {
-        foreach($slugs as $locale => $slug) {
+        foreach ($slugs as $locale => $slug) {
             if (UrlRecord::existsIgnoringRedirects($slug, $locale, $this->ignoredModel)) {
                 session()->flash('unique_url_slug_validation', [
                     'locale'       => $locale,