thinktomorrow / chief

src/Old/Sets/SetReference.php

Spacing +5 added lines, -5 removed lines

@@ -38,7 +38,7 @@ 
     {
         // Constraints
         if (!isset($values['action'])) {
-            throw new \InvalidArgumentException('Set reference array is missing required values for the "action" keys. Given: ' . print_r($values, true));
+            throw new \InvalidArgumentException('Set reference array is missing required values for the "action" keys. Given: '.print_r($values, true));
         }
 
         return new static(
@@ -53,14 +53,14 @@ 
     {
         $sets = config('chief.sets', []);
 
-        return collect($sets)->map(function ($set, $key) {
+        return collect($sets)->map(function($set, $key) {
             return SetReference::fromArray($key, $set);
         });
     }
 
     public static function find($key): ?SetReference
     {
-        return static::all()->filter(function ($ref) use ($key) {
+        return static::all()->filter(function($ref) use ($key) {
             return $ref->key() == $key;
         })->first();
     }
@@ -152,11 +152,11 @@ 
     private static function validateAction($class, $method)
     {
         if (!class_exists($class)) {
-            throw new \InvalidArgumentException('The class [' . $class . '] isn\'t a valid class reference or does not exist in the chief-settings.sets config entry.');
+            throw new \InvalidArgumentException('The class ['.$class.'] isn\'t a valid class reference or does not exist in the chief-settings.sets config entry.');
         }
 
         if (!method_exists($class, $method)) {
-            throw new \InvalidArgumentException('The method [' . $method . '] does not exist on the class [' . $class . ']. Make sure you provide a valid method to the action value in the chief-settings.sets config entry.');
+            throw new \InvalidArgumentException('The method ['.$method.'] does not exist on the class ['.$class.']. Make sure you provide a valid method to the action value in the chief-settings.sets config entry.');
         }
     }
 

src/Old/PageBuilder/PageBuilder.php

Spacing +10 added lines, -10 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Thinktomorrow\Chief\Old\PageBuilder;
 
@@ -42,7 +42,7 @@ 
         $availableChildren = AvailableChildren::forParent($model);
 
         // Only include modules of this model or shared ones.
-        $modules = $availableChildren->onlyModules()->reject(function ($module) use ($model) {
+        $modules = $availableChildren->onlyModules()->reject(function($module) use ($model) {
             return $module->owner_id != null && $module->owner_id != $model->id;
         });
 
@@ -51,7 +51,7 @@ 
         $available_sets = ModelReferencePresenter::toGroupedSelectValues($availableChildren->onlySets())->toArray();
 
         // Current sections
-        $sections = $model->children()->map(function ($section, $index) use($model) {
+        $sections = $model->children()->map(function($section, $index) use($model) {
 //            if ($section instanceof TranslatableContract) {
 //
 //            }
@@ -88,14 +88,14 @@ 
         $trans = [];
 
         // Has dynamic attributes
-        if(public_method_exists($model, 'dynamic')) {
+        if (public_method_exists($model, 'dynamic')) {
             foreach (config('chief.locales') as $locale) {
                 $trans[$locale] = [];
 
-                foreach($model->rawDynamicValues() as $key => $values) {
-                    if(is_array($values)) {
-                        foreach($values as $dynamicLocale => $dynamicValue) {
-                            if($dynamicLocale === $locale) {
+                foreach ($model->rawDynamicValues() as $key => $values) {
+                    if (is_array($values)) {
+                        foreach ($values as $dynamicLocale => $dynamicValue) {
+                            if ($dynamicLocale === $locale) {
                                 $trans[$locale][$key] = $dynamicValue;
                             }
                         }
@@ -105,9 +105,9 @@ 
         }
 
         // Astrotomic translatable
-        if($model instanceof Translatable) {
+        if ($model instanceof Translatable) {
             foreach (config('chief.locales') as $locale) {
-                if(!isset($trans[$locale])) $trans[$locale] = [];
+                if (!isset($trans[$locale])) $trans[$locale] = [];
 
                 $trans[$locale] = array_merge($trans[$locale], $model->getTranslation($locale)->toArray());
             }

Braces +3 added lines, -1 removed lines

@@ -107,7 +107,9 @@
         // Astrotomic translatable
         if($model instanceof Translatable) {
             foreach (config('chief.locales') as $locale) {
-                if(!isset($trans[$locale])) $trans[$locale] = [];
+                if(!isset($trans[$locale])) {
+                    $trans[$locale] = [];
+                }
 
                 $trans[$locale] = array_merge($trans[$locale], $model->getTranslation($locale)->toArray());
             }

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/Application/SaveUrlSlugs.php

Spacing +7 added lines, -7 removed lines

@@ -38,7 +38,7 @@ 
     private function saveRecord(ProvidesUrl $model, string $locale, ?string $slug, Collection $existingRecords)
     {
         // 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()
@@ -47,7 +47,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();
             });
 
@@ -64,7 +64,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]);
             }
@@ -105,12 +105,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();
             }
@@ -125,11 +125,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) {
+        $existingRecords->reject(function($existingRecord) {
             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/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);
     }