thinktomorrow / chief

src/PageBuilder/PresentSections.php

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
             $this->addModelToCollection($i, $child);
         }
 
-        return $this->sets->values()->map(function (ViewableContract $child) {
+        return $this->sets->values()->map(function(ViewableContract $child) {
             return ($this->withSnippets && method_exists($child, 'withSnippets'))
                 ? $child->withSnippets()->setViewParent($this->parent)->renderView()
                 : $child->setViewParent($this->parent)->renderView();
@@ -95,7 +95,7 @@ 
     {
         // Only published pages you fool!
         // TODO: check for assistant instead of method existence
-        if (method_exists($model, 'isPublished') && ! $model->isPublished()) {
+        if (method_exists($model, 'isPublished') && !$model->isPublished()) {
             return;
         }
 

src/Urls/UrlSlugFields.php

Indentation +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 
         // Add description to wildcard field only when there are locale values.
         $wildCardField->label('Default link')
-                      ->description('Standaard link die altijd van toepassing is indien er geen taalspecifieke link voorhanden is. Laat deze leeg indien je deze link in bepaalde talen niet wilt beschikbaar maken.');
+                        ->description('Standaard link die altijd van toepassing is indien er geen taalspecifieke link voorhanden is. Laat deze leeg indien je deze link in bepaalde talen niet wilt beschikbaar maken.');
 
         foreach ($locales as $locale) {
             $fields['url-slugs.' . $locale] = UrlSlugField::make('url-slugs.' . $locale)

Braces +6 added lines, -2 removed lines

@@ -35,7 +35,9 @@ 
             ->label('')
         ]);
 
-        if (count($locales) < 2) return $fields;
+        if (count($locales) < 2) {
+            return $fields;
+        }
 
         // Add description to wildcard field only when there are locale values.
         $wildCardField->label('Default link')
@@ -71,7 +73,9 @@ 
                 continue;
             }
 
-            if(!isset($fields['url-slugs.'.$record->locale])) continue;
+            if(!isset($fields['url-slugs.'.$record->locale])) {
+                continue;
+            }
 
             $fields['url-slugs.'.$record->locale]
                 ->setUrlRecord($record)

Spacing +11 added lines, -11 removed lines

@@ -26,7 +26,7 @@ 
     {
         $array = [];
 
-        foreach($this->all() as $field) {
+        foreach ($this->all() as $field) {
             $array[] = $field->toArray();
         }
 
@@ -41,8 +41,8 @@ 
     private static function initEmptyFields(array $locales, ProvidesUrl $model): self
     {
         // Add wildcard field as default
-        $fields = new static([ $wildCardField = UrlSlugField::make('url-slugs.' . UrlAssistant::WILDCARD)
-            ->name('url-slugs[' . UrlAssistant::WILDCARD . ']')
+        $fields = new static([$wildCardField = UrlSlugField::make('url-slugs.'.UrlAssistant::WILDCARD)
+            ->name('url-slugs['.UrlAssistant::WILDCARD.']')
             ->label('')
         ]);
 
@@ -53,11 +53,11 @@ 
                       ->description('Standaard link die altijd van toepassing is indien er geen taalspecifieke link voorhanden is. Laat deze leeg indien je deze link in bepaalde talen niet wilt beschikbaar maken.');
 
         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;
@@ -69,25 +69,25 @@ 
      */
     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 ($record->isManagedAsWildCard()) {
-                $fields['url-slugs.' . UrlAssistant::WILDCARD]
+                $fields['url-slugs.'.UrlAssistant::WILDCARD]
                     ->setUrlRecord($record)
                     ->setBaseUrlSegment($model->baseUrlSegment($record->locale));
                 continue;
             }
 
-            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

@@ -26,7 +26,7 @@
      */
     public function passes($attribute, $slugs)
     {
-        foreach($slugs as $locale => $slug) {
+        foreach ($slugs as $locale => $slug) {
             if ($locale == '_all_') {
                 $locale = null;
             }

src/Urls/MemoizedUrlRecord.php

Spacing +2 added lines, -2 removed lines

@@ -8,14 +8,14 @@
 {
     public static function findByModel(Model $model, string $locale = null): UrlRecord
     {
-        return chiefMemoize('url-records-find-by-model', function($model, $locale = null){
+        return chiefMemoize('url-records-find-by-model', function($model, $locale = null) {
             return parent::findByModel($model, $locale);
         }, [$model, $locale]);
     }
 
     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/Urls/UrlRecord.php

Indentation +5 added lines, -5 removed lines

@@ -63,8 +63,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 function replace(array $values): UrlRecord
@@ -115,9 +115,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 +5 added lines, -5 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.'].');
         }
 
@@ -83,7 +83,7 @@ 
 
     public function redirectTo(self $record = null): ?UrlRecord
     {
-        if(!$record){
+        if (!$record) {
             return $this->isRedirect() ? static::find($this->redirect_id) : null;
         }
 
@@ -112,7 +112,7 @@ 
         $builder = static::where('locale', $locale)
                         ->where('slug', $slug);
 
-        if($ignoredModel){
+        if ($ignoredModel) {
             $builder->whereNotIn('id', function($query) use($ignoredModel){
                 $query->select('id')
                       ->from('chief_urls')

src/Urls/ChiefResponse.php

Spacing +11 added lines, -11 removed lines

@@ -14,41 +14,41 @@
 {
     public static function fromRequest(Request $request = null, $locale = null)
     {
-        if(!$request) $request = request();
-        if(!$locale) $locale = app()->getLocale();
+        if (!$request) $request = request();
+        if (!$locale) $locale = app()->getLocale();
 
         return static::fromSlug($request->path(), $locale);
     }
 
     public static function fromSlug(string $slug, $locale = null)
     {
-        if(!$locale) $locale = app()->getLocale();
+        if (!$locale) $locale = app()->getLocale();
 
-        try{
+        try {
             $urlRecord = UrlRecord::findBySlug($slug, $locale);
 
             $model = Morphables::instance($urlRecord->model_type)->find($urlRecord->model_id);
 
-            if($urlRecord->isRedirect()){
+            if ($urlRecord->isRedirect()) {
                 return static::createRedirect($model->url($locale));
             }
 
-            if(method_exists($model, 'isPublished') && ! $model->isPublished()){
+            if (method_exists($model, 'isPublished') && !$model->isPublished()) {
 
                 /** When admin is logged in and this request is in preview mode, we allow the view */
-                if( ! PreviewMode::fromRequest()->check()){
-                    throw new NotFoundHttpException('Model found for request ['. $slug .'] but it is not published.');
+                if (!PreviewMode::fromRequest()->check()) {
+                    throw new NotFoundHttpException('Model found for request ['.$slug.'] but it is not published.');
                 }
             }
 
             return new static($model->renderView(), 200);
         }
-        catch(UrlRecordNotFound | NotFoundMorphKey $e)
+        catch (UrlRecordNotFound | NotFoundMorphKey $e)
         {
-            if(config('thinktomorrow.chief.strict')){ throw $e; }
+            if (config('thinktomorrow.chief.strict')) { throw $e; }
         }
 
-        throw new NotFoundHttpException('No url or model found for request ['. $slug .'] for locale ['.$locale.'].');
+        throw new NotFoundHttpException('No url or model found for request ['.$slug.'] for locale ['.$locale.'].');
     }
 
     private static function createRedirect(string $url)

Braces +10 added lines, -5 removed lines

@@ -14,15 +14,21 @@ 
 {
     public static function fromRequest(Request $request = null, $locale = null)
     {
-        if(!$request) $request = request();
-        if(!$locale) $locale = app()->getLocale();
+        if(!$request) {
+            $request = request();
+        }
+        if(!$locale) {
+            $locale = app()->getLocale();
+        }
 
         return static::fromSlug($request->path(), $locale);
     }
 
     public static function fromSlug(string $slug, $locale = null)
     {
-        if(!$locale) $locale = app()->getLocale();
+        if(!$locale) {
+            $locale = app()->getLocale();
+        }
 
         try{
             $urlRecord = UrlRecord::findBySlug($slug, $locale);
@@ -42,8 +48,7 @@ 
             }
 
             return new static($model->renderView(), 200);
-        }
-        catch(UrlRecordNotFound | NotFoundMorphKey $e)
+        } catch(UrlRecordNotFound | NotFoundMorphKey $e)
         {
             if(config('thinktomorrow.chief.strict')){ throw $e; }
         }

src/Urls/UrlSlugField.php

Spacing +2 added lines, -2 removed lines

@@ -31,11 +31,11 @@
 
     private function rawSlugValue(): string
     {
-        if(!$this->urlRecord) return '';
+        if (!$this->urlRecord) return '';
 
         $slug = $this->urlRecord->slug;
 
-        if($this->startsWithBaseUrlSegment($slug)){
+        if ($this->startsWithBaseUrlSegment($slug)) {
             $slug = trim(substr($slug, strlen($this->baseUrlSegment)), '/');
         }
 

Braces +3 added lines, -1 removed lines

@@ -31,7 +31,9 @@
 
     private function rawSlugValue(): string
     {
-        if(!$this->urlRecord) return '';
+        if(!$this->urlRecord) {
+            return '';
+        }
 
         $slug = $this->urlRecord->slug;
 

src/Urls/SaveUrlSlugs.php

Spacing +14 added lines, -14 removed lines

@@ -21,15 +21,15 @@ 
     {
         $this->existingRecords = UrlRecord::getByModel($this->model);
 
-        foreach($slugs as $locale => $slug){
+        foreach ($slugs as $locale => $slug) {
 
-            if($locale == UrlAssistant::WILDCARD){
+            if ($locale == UrlAssistant::WILDCARD) {
 
                 $this->saveWildcardSlug($this->remainingLocales($slugs), $slug);
                 continue;
             }
 
-            if(!$slug){
+            if (!$slug) {
                 $this->deleteRecord($locale);
                 continue;
             }
@@ -46,9 +46,9 @@ 
      */
     private function saveWildcardSlug(array $locales, ?string $slug)
     {
-        foreach($locales as $locale)
+        foreach ($locales as $locale)
         {
-            if(!$slug) {
+            if (!$slug) {
                 $this->deleteRecord($locale, true);
                 continue;
             }
@@ -77,20 +77,20 @@ 
         $this->deleteIdenticalRedirects($this->existingRecords, $locale, $slug, $savingAsWildcard);
 
         // If slug entry is left empty, all existing records will be deleted
-        if(!$slug){
+        if (!$slug) {
             $recordsWithSameLocale->filter(function($existingRecord) use($savingAsWildcard){
                 return ($existingRecord->isManagedAsWildcard() === $savingAsWildcard);
-            })->each(function($existingRecord){
+            })->each(function($existingRecord) {
                 $existingRecord->delete();
             });
         }
-        elseif($recordsWithSameLocale->isEmpty()){
+        elseif ($recordsWithSameLocale->isEmpty()) {
             $this->createRecord($locale, $slug, $savingAsWildcard);
         }
-        else{
+        else {
             // Only replace the existing records that differ from the current passed slugs
             $recordsWithSameLocale->each(function($existingRecord) use($slug, $savingAsWildcard){
-                if($existingRecord->slug != $slug){
+                if ($existingRecord->slug != $slug) {
                     $existingRecord->replace(['slug' => $slug, 'managed_as_wildcard' => $savingAsWildcard]);
                 }
             });
@@ -116,13 +116,13 @@ 
      */
     private function deleteIdenticalRedirects($existingRecords, $locale, $slug, bool $managedAsWildcard = false): void
     {
-        $existingRecords->filter(function ($record) use ($locale, $managedAsWildcard) {
+        $existingRecords->filter(function($record) use ($locale, $managedAsWildcard) {
             return (
                 $record->locale == $locale &&
                 $managedAsWildcard === $record->isManagedAsWildcard() &&
                 $record->isRedirect()
             );
-        })->each(function ($existingRecord) use ($slug) {
+        })->each(function($existingRecord) use ($slug) {
             if ($existingRecord->slug == $slug) {
                 $existingRecord->delete();
             }
@@ -141,7 +141,7 @@ 
 
         foreach ($slugs as $locale => $slug) {
             if ($slug && $locale !== UrlAssistant::WILDCARD) {
-                if(false !== ($index = array_search($locale, $remainingLocales)))
+                if (false !== ($index = array_search($locale, $remainingLocales)))
                 {
                     unset($remainingLocales[$index]);
                 }
@@ -158,7 +158,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 +2 added lines, -4 removed lines

@@ -83,11 +83,9 @@
             })->each(function($existingRecord){
                 $existingRecord->delete();
             });
-        }
-        elseif($recordsWithSameLocale->isEmpty()){
+        } elseif($recordsWithSameLocale->isEmpty()){
             $this->createRecord($locale, $slug, $savingAsWildcard);
-        }
-        else{
+        } else{
             // Only replace the existing records that differ from the current passed slugs
             $recordsWithSameLocale->each(function($existingRecord) use($slug, $savingAsWildcard){
                 if($existingRecord->slug != $slug){

src/Management/Application/StoringAndUpdatingFields.php

Spacing +5 added lines, -5 removed lines

@@ -20,11 +20,11 @@ 
         foreach ($manager->fieldsWithAssistantFields() as $field) {
 
             // Custom save methods
-            if($this->detectCustomSaveMethods($manager, $field)) continue;
+            if ($this->detectCustomSaveMethods($manager, $field)) continue;
 
             // Media fields are treated separately
             if ($field->ofType(FieldType::MEDIA, FieldType::DOCUMENT)) {
-                if (! isset($this->saveMethods['_files'])) {
+                if (!isset($this->saveMethods['_files'])) {
                     $this->saveMethods['_files'] = ['field' => new Fields([$field]), 'method' => 'uploadMedia'];
                     continue;
                 }
@@ -34,7 +34,7 @@ 
             }
 
             // Custom set methods - default is the generic setField() method.
-            $methodName = 'set'. ucfirst(camel_case($field->key())) . 'Field';
+            $methodName = 'set'.ucfirst(camel_case($field->key())).'Field';
             (method_exists($manager, $methodName))
                 ? $manager->$methodName($field, $request)
                 : $manager->setField($field, $request);
@@ -46,10 +46,10 @@ 
 
     protected function detectCustomSaveMethods(Manager $manager, Field $field): bool
     {
-        $saveMethodName = 'save'. ucfirst(camel_case($field->key())) . 'Field';
+        $saveMethodName = 'save'.ucfirst(camel_case($field->key())).'Field';
 
         // Custom save method on assistant
-        foreach($manager->assistants() as $assistant)
+        foreach ($manager->assistants() as $assistant)
         {
             if (method_exists($assistant, $saveMethodName)) {
                 $this->saveAssistantMethods[$field->key] = ['field' => $field, 'method' => $saveMethodName, 'assistant' => $assistant];

Braces +3 added lines, -1 removed lines

@@ -20,7 +20,9 @@
         foreach ($manager->fieldsWithAssistantFields() as $field) {
 
             // Custom save methods
-            if($this->detectCustomSaveMethods($manager, $field)) continue;
+            if($this->detectCustomSaveMethods($manager, $field)) {
+                continue;
+            }
 
             // Media fields are treated separately
             if ($field->ofType(FieldType::MEDIA, FieldType::DOCUMENT)) {