thinktomorrow / chief

src/Site/Menu/Menu.php

Spacing +4 added lines, -4 removed lines

@@ -28,14 +28,14 @@ 
     {
         $types = config('chief.menus', []);
 
-        return collect($types)->map(function ($menu, $key) {
+        return collect($types)->map(function($menu, $key) {
             return new static($key, $menu['label'], $menu['view']);
         });
     }
 
     public static function find($key): ?self
     {
-        return static::all()->filter(function ($menu) use ($key) {
+        return static::all()->filter(function($menu) use ($key) {
             return $menu->key() == $key;
         })->first();
     }
@@ -84,10 +84,10 @@ 
     {
         $menu = [];
 
-        $this->items()->each(function ($item) use (&$menu) {
+        $this->items()->each(function($item) use (&$menu) {
             $menu[] = sprintf('<li><a href="%s">%s</a></li>', $item->url, $item->label);
         });
 
-        return '<ul>' . implode('', $menu) . '</ul>';
+        return '<ul>'.implode('', $menu).'</ul>';
     }
 }

src/Site/Urls/Controllers/LinksController.php

Spacing +4 added lines, -4 removed lines

@@ -20,19 +20,19 @@
     public function update(Request $request)
     {
         /** @var ProvidesUrl|Model $model */
-        $model = (new ModelReference($request->modelClass, (int) $request->modelId))->instance();
+        $model = (new ModelReference($request->modelClass, (int)$request->modelId))->instance();
 
         $this->validate($request, ['links' => [
-            'array', 'min:1', new UniqueUrlSlugRule($model, $model),], [], ['links.*' => 'taalspecifieke link']
+            'array', 'min:1', new UniqueUrlSlugRule($model, $model), ], [], ['links.*' => 'taalspecifieke link']
         ]);
 
         (new SaveUrlSlugs())->handle($model, $request->input('links', []));
 
         // 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/Form/LinkForm.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
     {
         return new static($model, \Thinktomorrow\Chief\Site\Urls\UrlRecord::getByModel($model)
             ->groupBy('locale')
-            ->map(function ($records) {
+            ->map(function($records) {
                 return $records->sortBy('redirect_id')->sortByDesc('created_at');
             }));
     }
@@ -54,7 +54,7 @@ 
             $currentRecord = $this->urlRecords->get($locale, collect())->reject->isRedirect()->first();
 
             $values[$locale] = (object)[
-                'host'         => $this->model->resolveUrl($locale, $this->model->baseUrlSegment($locale)) . '/',
+                'host'         => $this->model->resolveUrl($locale, $this->model->baseUrlSegment($locale)).'/',
                 'fixedSegment' => $this->model->baseUrlSegment($locale),
                 'value'        => $currentRecord
                     ? $this->rawSlugValue($currentRecord->slug, $this->model->baseUrlSegment($locale))

src/Shared/Concerns/Viewable/Viewable.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
         }
 
         if (config('chief.strict')) {
-            throw new NotFoundViewKey('Missing view key. Please add a [viewKey] property to ' . get_class($this));
+            throw new NotFoundViewKey('Missing view key. Please add a [viewKey] property to '.get_class($this));
         }
 
         return '';

src/Setup/Console/GeneratePage.php

Spacing +21 added lines, -21 removed lines

@@ -39,10 +39,10 @@ 
 
         // Set required paths
         $this->dirs = ['base' => $this->settings['base_path'] ?? base_path()];
-        $this->dirs['model'] = $this->settings['model_path'] ?? $this->dirs['base'] . '/' . config('chief.domain.path', 'src');
-        $this->dirs['views'] = $this->settings['views_path'] ?? $this->dirs['base'] . '/resources/views';
-        $this->dirs['controller'] = $this->settings['controller_path'] ?? $this->dirs['base'] . '/app/Http/Controllers';
-        $this->files['routes'] = $this->settings['routes_file'] ?? $this->dirs['base'] . '/routes/web.php';
+        $this->dirs['model'] = $this->settings['model_path'] ?? $this->dirs['base'].'/'.config('chief.domain.path', 'src');
+        $this->dirs['views'] = $this->settings['views_path'] ?? $this->dirs['base'].'/resources/views';
+        $this->dirs['controller'] = $this->settings['controller_path'] ?? $this->dirs['base'].'/app/Http/Controllers';
+        $this->files['routes'] = $this->settings['routes_file'] ?? $this->dirs['base'].'/routes/web.php';
     }
 
     public function handle()
@@ -64,19 +64,19 @@ 
     private function publishModel()
     {
         $this->publishFile(
-            __DIR__ . '/stubs/model.php.stub',
-            $to = $this->dirs['model'] . '/' . ucfirst($this->plural) . '/' . ucfirst($this->singular) . '.php',
+            __DIR__.'/stubs/model.php.stub',
+            $to = $this->dirs['model'].'/'.ucfirst($this->plural).'/'.ucfirst($this->singular).'.php',
             'model'
         );
 
-        $this->addToConfig('collections', [$this->plural => $this->guessNamespace() . '\\' . ucfirst($this->singular)]);
+        $this->addToConfig('collections', [$this->plural => $this->guessNamespace().'\\'.ucfirst($this->singular)]);
     }
 
     private function publishController()
     {
         $this->publishFile(
-            __DIR__ . '/stubs/controller.php.stub',
-            $to = $this->dirs['controller'] . '/' . ucfirst($this->plural) . '/' . ucfirst($this->singular) . '.php',
+            __DIR__.'/stubs/controller.php.stub',
+            $to = $this->dirs['controller'].'/'.ucfirst($this->plural).'/'.ucfirst($this->singular).'.php',
             'controller'
         );
     }
@@ -115,8 +115,8 @@ 
     private function modelTraits()
     {
         return [
-            '\\' . Publishable::class,
-            '\\' . Sortable::class,
+            '\\'.Publishable::class,
+            '\\'.Sortable::class,
             'q' => 'Proceed.',
         ];
     }
@@ -131,7 +131,7 @@ 
     protected function publishFile($from, $to, $type)
     {
         if ($this->filesystem->exists($to) && !$this->option('force')) {
-            if (!$this->confirm('File [' . $to . '] already exists? Overwrite this file?')) {
+            if (!$this->confirm('File ['.$to.'] already exists? Overwrite this file?')) {
                 return;
             }
         }
@@ -170,7 +170,7 @@ 
 
         $to = str_replace($this->dirs['base'], '', realpath($to));
 
-        $this->line('<info>Copied ' . $type . '</info> <comment>[' . $from . ']</comment> <info>To</info> <comment>[' . $to . ']</comment>');
+        $this->line('<info>Copied '.$type.'</info> <comment>['.$from.']</comment> <info>To</info> <comment>['.$to.']</comment>');
     }
 
     protected function replacePlaceholders($content)
@@ -188,17 +188,17 @@ 
 
     private function generateImportStatements(): string
     {
-        return collect(['\\' . Page::class])
-            ->map(function ($statement) {
-                return 'use ' . $statement . ";\n    ";
+        return collect(['\\'.Page::class])
+            ->map(function($statement) {
+                return 'use '.$statement.";\n    ";
             })->implode('');
     }
 
     private function generateTraitStatements(): string
     {
         return collect($this->chosenTraits)
-            ->map(function ($statement) {
-                return 'use ' . $statement . ";\n    ";
+            ->map(function($statement) {
+                return 'use '.$statement.";\n    ";
             })->implode('');
     }
 
@@ -217,12 +217,12 @@ 
 
         // We make an estimated guess based on the project name. At Think Tomorrow, we
         // have a src folder which is PSR-4 namespaced by the project name itself.
-        return str_replace('\\\\', '\\', ucfirst(config('chief.domain.namespace', 'App')) . '\\' . ucfirst($this->plural));
+        return str_replace('\\\\', '\\', ucfirst(config('chief.domain.namespace', 'App')).'\\'.ucfirst($this->plural));
     }
 
     private function addToConfig($configKey, $value)
     {
-        $current_values = config('chief.' . $configKey);
+        $current_values = config('chief.'.$configKey);
 
         if (is_array($current_values)) {
             $value = array_merge($current_values, $value);
@@ -237,7 +237,7 @@ 
 
         // Find value - note: this regex does not work for nested arrays!
         // Also creates array with the non-short syntax.
-        $content = preg_replace('/[\'|"]' . $key . '[\'|"] ?=> ?(\[[^\]]*\]|[\'|"].*[\'|"])/', var_export($value, true), $content);
+        $content = preg_replace('/[\'|"]'.$key.'[\'|"] ?=> ?(\[[^\]]*\]|[\'|"].*[\'|"])/', var_export($value, true), $content);
 
         file_put_contents($file, $content);
     }

src/Site/Urls/Application/SaveUrlSlugs.php

Spacing +8 added lines, -8 removed lines

@@ -43,7 +43,7 @@ 
     private function saveRecord(ProvidesUrl $model, string $locale, ?string $slug, Collection $existingRecords, bool $strict = true)
     {
         // Existing ones for this locale?
-        $nonRedirectsWithSameLocale = $existingRecords->filter(function ($record) use ($locale) {
+        $nonRedirectsWithSameLocale = $existingRecords->filter(function($record) use ($locale) {
             return (
                 $record->locale == $locale &&
                 !$record->isRedirect()
@@ -52,7 +52,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();
             });
 
@@ -69,7 +69,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]);
             }
@@ -98,7 +98,7 @@ 
         $this->deleteIdenticalRedirects($sameExistingRecords, $locale, $slug);
 
         // Also delete any urls that match this locale and slug but are related to another model
-        if(!$this->strict) {
+        if (!$this->strict) {
             $this->deleteIdenticalRecords($model, $sameExistingRecords);
         }
     }
@@ -112,12 +112,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();
             }
@@ -128,11 +128,11 @@ 
     {
         // 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) use($model) {
+        $existingRecords->reject(function($existingRecord) use($model) {
             return (
                 $existingRecord->model_type == $model->getMorphClass() &&
                 $existingRecord->model_id == $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();

src/ManagedModels/Assistants/ManagedModelDefaults.php

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
 
     public function adminLabel(string $key, $default = null, array $replace = [])
     {
-        if (! ($value = data_get($this->adminLabels(), $key)) ) {
+        if (!($value = data_get($this->adminLabels(), $key))) {
             return $default;
         }
 
@@ -36,7 +36,7 @@ 
      */
     private function adminLabels(): array
     {
-        $singular = Str::of(static::managedModelKey())->singular()->replace('_',' ')->__toString();
+        $singular = Str::of(static::managedModelKey())->singular()->replace('_', ' ')->__toString();
 
         return [
             /**
@@ -46,7 +46,7 @@ 
              */
             'label' => $singular, // Label used to refer to the generic model
             'nav_label' => $singular, // label used in the chief navigation
-            'page_title' => Str::of(static::managedModelKey())->plural()->replace('_',' ')->__toString(), // Generic collection title, for example used on index
+            'page_title' => Str::of(static::managedModelKey())->plural()->replace('_', ' ')->__toString(), // Generic collection title, for example used on index
 
             /**
              * Instance labels
@@ -63,17 +63,17 @@ 
 
     private function onlineStatusAsLabel(): string
     {
-        if(!$this instanceof StatefulContract) return '';
+        if (!$this instanceof StatefulContract) return '';
 
         if ($this->stateOf(PageState::KEY) === PageState::PUBLISHED) {
             return $this instanceof ProvidesUrl
-                ? '<a href="' . $this->url() . '" target="_blank"><em>online</em></a>'
+                ? '<a href="'.$this->url().'" target="_blank"><em>online</em></a>'
                 : '<span><em>online</em></span>';
         }
 
         if ($this->stateOf(PageState::KEY) === PageState::DRAFT) {
             return $this instanceof ProvidesUrl
-                ? '<a href="' . $this->url() . '" target="_blank" class="text-error"><em>offline</em></a>'
+                ? '<a href="'.$this->url().'" target="_blank" class="text-error"><em>offline</em></a>'
                 : '<span class="text-error"><em>offline</em></span>';
         }
 

Braces +3 added lines, -1 removed lines

@@ -63,7 +63,9 @@
 
     private function onlineStatusAsLabel(): string
     {
-        if(!$this instanceof StatefulContract) return '';
+        if(!$this instanceof StatefulContract) {
+            return '';
+        }
 
         if ($this->stateOf(PageState::KEY) === PageState::PUBLISHED) {
             return $this instanceof ProvidesUrl

src/Managers/Assistants/ArchiveAssistant.php

Spacing +9 added lines, -9 removed lines

@@ -20,15 +20,15 @@ 
     public function routesArchiveAssistant(): array
     {
         return [
-            ManagedRoute::post('archive','archive/{id}'),
-            ManagedRoute::post('unarchive','unarchive/{id}'),
+            ManagedRoute::post('archive', 'archive/{id}'),
+            ManagedRoute::post('unarchive', 'unarchive/{id}'),
             ManagedRoute::get('archive_index'),
         ];
     }
 
     public function canArchiveAssistant(string $action, $model = null): bool
     {
-        if(!in_array($action, ['archive', 'unarchive', 'archive_index'])) return false;
+        if (!in_array($action, ['archive', 'unarchive', 'archive_index'])) return false;
 
         try {
             $this->authorize('update-page');
@@ -36,15 +36,15 @@ 
             return false;
         }
 
-        if($action === 'archive_index') {
+        if ($action === 'archive_index') {
             // Archive index is only visitable when there is at least one model archived.
-            if(public_method_exists($this->managedModelClass(), 'scopeArchived')) {
+            if (public_method_exists($this->managedModelClass(), 'scopeArchived')) {
                 return $this->managedModelClass()::archived()->count() > 0;
             }
             return false;
         }
 
-        if(!$model || !$model instanceof StatefulContract) return false;
+        if (!$model || !$model instanceof StatefulContract) return false;
 
         return PageState::make($model)->can($action);
     }
@@ -64,7 +64,7 @@ 
 
             // Ok now get all urls from this model and point them to the new records
             foreach ($archivedUrlRecords as $urlRecord) {
-                if ($targetRecord = $targetRecords->first(function ($record) use ($urlRecord) {
+                if ($targetRecord = $targetRecords->first(function($record) use ($urlRecord) {
                     return ($record->locale == $urlRecord->locale && !$record->isRedirect());
                 })) {
                     $urlRecord->redirectTo($targetRecord);
@@ -84,7 +84,7 @@ 
 
         Audit::activity()->performedOn($model)->log('archived');
 
-        return redirect()->to($this->route('index'))->with('messages.success', $model->adminLabel('title') . ' is gearchiveerd.');
+        return redirect()->to($this->route('index'))->with('messages.success', $model->adminLabel('title').' is gearchiveerd.');
     }
 
     public function unarchive(Request $request, $id)
@@ -97,7 +97,7 @@ 
 
         Audit::activity()->performedOn($model)->log('unarchived');
 
-        return redirect()->to($this->route('index'))->with('messages.success', $model->adminLabel('title') . ' is uit het archief gehaald.');
+        return redirect()->to($this->route('index'))->with('messages.success', $model->adminLabel('title').' is uit het archief gehaald.');
     }
 
     public function archiveIndex(Request $request)

Braces +6 added lines, -2 removed lines

@@ -28,7 +28,9 @@ 
 
     public function canArchiveAssistant(string $action, $model = null): bool
     {
-        if(!in_array($action, ['archive', 'unarchive', 'archive_index'])) return false;
+        if(!in_array($action, ['archive', 'unarchive', 'archive_index'])) {
+            return false;
+        }
 
         try {
             $this->authorize('update-page');
@@ -44,7 +46,9 @@ 
             return false;
         }
 
-        if(!$model || !$model instanceof StatefulContract) return false;
+        if(!$model || !$model instanceof StatefulContract) {
+            return false;
+        }
 
         return PageState::make($model)->can($action);
     }

src/Managers/Assistants/ManagerDefaults.php

Spacing +5 added lines, -5 removed lines

@@ -28,8 +28,8 @@ 
 
     public function route(string $action, $model = null, ...$parameters): string
     {
-        foreach(DiscoverTraitMethods::belongingTo(static::class, 'route') as $method) {
-            if(null !== ($route = $this->$method($action, $model, ...$parameters))){
+        foreach (DiscoverTraitMethods::belongingTo(static::class, 'route') as $method) {
+            if (null !== ($route = $this->$method($action, $model, ...$parameters))) {
                 return $route;
             }
         }
@@ -39,8 +39,8 @@ 
 
     public function can(string $action, $model = null): bool
     {
-        foreach(DiscoverTraitMethods::belongingTo(static::class, 'can') as $method) {
-            if(true === $this->$method($action, $model)){
+        foreach (DiscoverTraitMethods::belongingTo(static::class, 'can') as $method) {
+            if (true === $this->$method($action, $model)) {
                 return true;
             }
         }
@@ -56,7 +56,7 @@ 
             $parameters = array_merge((array)$modelId, $parameters);
         }
 
-        return route('chief.' . $this->managedModelClass()::managedModelKey() . '.' . $action, $parameters);
+        return route('chief.'.$this->managedModelClass()::managedModelKey().'.'.$action, $parameters);
     }
 
     private function guard(string $action, $model = null)