@@ -35,12 +35,12 @@ |
||
| 35 | 35 | |
| 36 | 36 | public function toReference(): SetReference |
| 37 | 37 | { |
| 38 | - $reference = SetReference::all()->first(function ($setReference) { |
|
| 38 | + $reference = SetReference::all()->first(function($setReference) { |
|
| 39 | 39 | return $setReference->key() == $this->key; |
| 40 | 40 | }); |
| 41 | 41 | |
| 42 | 42 | if (!$reference) { |
| 43 | - throw new \Exception('No query set found by key [' . $this->key . ']. Make sure that this ' . $this->key . ' set is added to the chief.sets config array.'); |
|
| 43 | + throw new \Exception('No query set found by key ['.$this->key.']. Make sure that this '.$this->key.' set is added to the chief.sets config array.'); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | return $reference; |
@@ -26,15 +26,15 @@ |
||
| 26 | 26 | { |
| 27 | 27 | $abilities = ['view', 'create', 'update', 'delete']; |
| 28 | 28 | |
| 29 | - return array_map(function ($val) use ($scope) { |
|
| 30 | - return $val . '-' . $scope; |
|
| 29 | + return array_map(function($val) use ($scope) { |
|
| 30 | + return $val.'-'.$scope; |
|
| 31 | 31 | }, $abilities); |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | public static function getPermissionsForIndex() |
| 35 | 35 | { |
| 36 | 36 | $permissions = $temp = []; |
| 37 | - self::all()->each(function ($permission) use (&$permissions, &$temp) { |
|
| 37 | + self::all()->each(function($permission) use (&$permissions, &$temp) { |
|
| 38 | 38 | $model = explode("_", $permission->name, 2)[1]; |
| 39 | 39 | $temp[$model][$permission->id] = explode("_", $permission->name, 2)[0]; |
| 40 | 40 | $permissions = $temp; |
@@ -85,9 +85,9 @@ discard block |
||
| 85 | 85 | $this->pageBuilderField(), |
| 86 | 86 | InputField::make('title')->translatable($this->model->availableLocales()) |
| 87 | 87 | ->validation('required-fallback-locale|max:200', [], [ |
| 88 | - 'trans.' . config('app.fallback_locale', 'nl') . '.title' => 'title', |
|
| 88 | + 'trans.'.config('app.fallback_locale', 'nl').'.title' => 'title', |
|
| 89 | 89 | ]) |
| 90 | - ->label('De titel van je ' . $this->model->labelSingular ?? 'pagina') |
|
| 90 | + ->label('De titel van je '.$this->model->labelSingular ?? 'pagina') |
|
| 91 | 91 | ->description('Dit is de titel die zal worden getoond in de overzichten en modules.'), |
| 92 | 92 | InputField::make('seo_title') |
| 93 | 93 | ->translatable($this->model->availableLocales()) |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | public function fieldArrangement($key = null): FieldArrangement |
| 128 | 128 | { |
| 129 | 129 | if ($key == 'create') { |
| 130 | - return new FieldArrangement($this->fieldsWithAssistantFields()->filterBy(function ($field) { |
|
| 130 | + return new FieldArrangement($this->fieldsWithAssistantFields()->filterBy(function($field) { |
|
| 131 | 131 | return in_array($field->getKey(), ['title']); |
| 132 | 132 | })); |
| 133 | 133 | } |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | if (is_array_empty($translation)) { |
| 212 | 212 | |
| 213 | 213 | // Nullify all values |
| 214 | - $trans[$locale] = array_map(function ($value) { |
|
| 214 | + $trans[$locale] = array_map(function($value) { |
|
| 215 | 215 | return null; |
| 216 | 216 | }, $translation); |
| 217 | 217 | continue; |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | return static::$managedModelKey; |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | - throw new \Exception('Missing required static property \'managedModelKey\' on ' . static::class . '.'); |
|
| 100 | + throw new \Exception('Missing required static property \'managedModelKey\' on '.static::class.'.'); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | /** |
@@ -137,9 +137,9 @@ discard block |
||
| 137 | 137 | public function flatReferenceLabel(): string |
| 138 | 138 | { |
| 139 | 139 | if ($this->exists) { |
| 140 | - $status = !$this->isPublished() ? ' [' . $this->statusAsPlainLabel() . ']' : null; |
|
| 140 | + $status = !$this->isPublished() ? ' ['.$this->statusAsPlainLabel().']' : null; |
|
| 141 | 141 | |
| 142 | - return $this->title ? $this->title . $status : ''; |
|
| 142 | + return $this->title ? $this->title.$status : ''; |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | return ''; |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | $classKey = get_class($this); |
| 151 | 151 | if (property_exists($this, 'labelSingular')) { |
| 152 | 152 | $labelSingular = $this->labelSingular; |
| 153 | - } else { |
|
| 153 | + }else { |
|
| 154 | 154 | $labelSingular = Str::singular($classKey); |
| 155 | 155 | } |
| 156 | 156 | |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | $locale = app()->getLocale(); |
| 191 | 191 | } |
| 192 | 192 | try { |
| 193 | - $memoizedKey = $this->getMorphClass() . '-' . $this->id . '-' . $locale; |
|
| 193 | + $memoizedKey = $this->getMorphClass().'-'.$this->id.'-'.$locale; |
|
| 194 | 194 | |
| 195 | 195 | if (isset(static::$cachedUrls[$memoizedKey])) { |
| 196 | 196 | return static::$cachedUrls[$memoizedKey]; |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | /** @inheritdoc */ |
| 215 | 215 | public function previewUrl(string $locale = null): string |
| 216 | 216 | { |
| 217 | - return $this->url($locale) . '?preview-mode'; |
|
| 217 | + return $this->url($locale).'?preview-mode'; |
|
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | |
@@ -253,11 +253,11 @@ discard block |
||
| 253 | 253 | public function statusAsLabel() |
| 254 | 254 | { |
| 255 | 255 | if ($this->isPublished()) { |
| 256 | - return '<a href="' . $this->url() . '" target="_blank"><em>online</em></a>'; |
|
| 256 | + return '<a href="'.$this->url().'" target="_blank"><em>online</em></a>'; |
|
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | if ($this->isDraft()) { |
| 260 | - return '<a href="' . $this->previewUrl() . '" target="_blank" class="text-error"><em>offline</em></a>'; |
|
| 260 | + return '<a href="'.$this->previewUrl().'" target="_blank" class="text-error"><em>offline</em></a>'; |
|
| 261 | 261 | } |
| 262 | 262 | |
| 263 | 263 | if ($this->isArchived()) { |
@@ -37,10 +37,10 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | // Set required paths |
| 39 | 39 | $this->dirs = ['base' => $this->settings['base_path'] ?? base_path()]; |
| 40 | - $this->dirs['model'] = $this->settings['model_path'] ?? $this->dirs['base'] . '/' . config('thinktomorrow.chief.domain.path', 'src'); |
|
| 41 | - $this->dirs['views'] = $this->settings['views_path'] ?? $this->dirs['base'] . '/resources/views'; |
|
| 42 | - $this->dirs['controller'] = $this->settings['controller_path'] ?? $this->dirs['base'] . '/app/Http/Controllers'; |
|
| 43 | - $this->files['routes'] = $this->settings['routes_file'] ?? $this->dirs['base'] . '/routes/web.php'; |
|
| 40 | + $this->dirs['model'] = $this->settings['model_path'] ?? $this->dirs['base'].'/'.config('thinktomorrow.chief.domain.path', 'src'); |
|
| 41 | + $this->dirs['views'] = $this->settings['views_path'] ?? $this->dirs['base'].'/resources/views'; |
|
| 42 | + $this->dirs['controller'] = $this->settings['controller_path'] ?? $this->dirs['base'].'/app/Http/Controllers'; |
|
| 43 | + $this->files['routes'] = $this->settings['routes_file'] ?? $this->dirs['base'].'/routes/web.php'; |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | public function handle() |
@@ -62,19 +62,19 @@ discard block |
||
| 62 | 62 | private function publishModel() |
| 63 | 63 | { |
| 64 | 64 | $this->publishFile( |
| 65 | - __DIR__ . '/stubs/model.php.stub', |
|
| 66 | - $to = $this->dirs['model'] . '/' . ucfirst($this->plural) . '/' . ucfirst($this->singular) . '.php', |
|
| 65 | + __DIR__.'/stubs/model.php.stub', |
|
| 66 | + $to = $this->dirs['model'].'/'.ucfirst($this->plural).'/'.ucfirst($this->singular).'.php', |
|
| 67 | 67 | 'model' |
| 68 | 68 | ); |
| 69 | 69 | |
| 70 | - $this->addToConfig('collections', [$this->plural => $this->guessNamespace() . '\\' . ucfirst($this->singular)]); |
|
| 70 | + $this->addToConfig('collections', [$this->plural => $this->guessNamespace().'\\'.ucfirst($this->singular)]); |
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | private function publishController() |
| 74 | 74 | { |
| 75 | 75 | $this->publishFile( |
| 76 | - __DIR__ . '/stubs/controller.php.stub', |
|
| 77 | - $to = $this->dirs['controller'] . '/' . ucfirst($this->plural) . '/' . ucfirst($this->singular) . '.php', |
|
| 76 | + __DIR__.'/stubs/controller.php.stub', |
|
| 77 | + $to = $this->dirs['controller'].'/'.ucfirst($this->plural).'/'.ucfirst($this->singular).'.php', |
|
| 78 | 78 | 'controller' |
| 79 | 79 | ); |
| 80 | 80 | } |
@@ -113,8 +113,8 @@ discard block |
||
| 113 | 113 | private function modelTraits() |
| 114 | 114 | { |
| 115 | 115 | return [ |
| 116 | - '\\' . Publishable::class, |
|
| 117 | - '\\' . Sortable::class, |
|
| 116 | + '\\'.Publishable::class, |
|
| 117 | + '\\'.Sortable::class, |
|
| 118 | 118 | 'q' => 'Proceed.', |
| 119 | 119 | ]; |
| 120 | 120 | } |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | protected function publishFile($from, $to, $type) |
| 130 | 130 | { |
| 131 | 131 | if ($this->filesystem->exists($to) && !$this->option('force')) { |
| 132 | - if (!$this->confirm('File [' . $to . '] already exists? Overwrite this file?')) { |
|
| 132 | + if (!$this->confirm('File ['.$to.'] already exists? Overwrite this file?')) { |
|
| 133 | 133 | return; |
| 134 | 134 | } |
| 135 | 135 | } |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | |
| 169 | 169 | $to = str_replace($this->dirs['base'], '', realpath($to)); |
| 170 | 170 | |
| 171 | - $this->line('<info>Copied ' . $type . '</info> <comment>[' . $from . ']</comment> <info>To</info> <comment>[' . $to . ']</comment>'); |
|
| 171 | + $this->line('<info>Copied '.$type.'</info> <comment>['.$from.']</comment> <info>To</info> <comment>['.$to.']</comment>'); |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | protected function replacePlaceholders($content) |
@@ -186,17 +186,17 @@ discard block |
||
| 186 | 186 | |
| 187 | 187 | private function generateImportStatements(): string |
| 188 | 188 | { |
| 189 | - return collect(['\\' . Page::class]) |
|
| 190 | - ->map(function ($statement) { |
|
| 191 | - return 'use ' . $statement . ";\n "; |
|
| 189 | + return collect(['\\'.Page::class]) |
|
| 190 | + ->map(function($statement) { |
|
| 191 | + return 'use '.$statement.";\n "; |
|
| 192 | 192 | })->implode(''); |
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | private function generateTraitStatements(): string |
| 196 | 196 | { |
| 197 | 197 | return collect($this->chosenTraits) |
| 198 | - ->map(function ($statement) { |
|
| 199 | - return 'use ' . $statement . ";\n "; |
|
| 198 | + ->map(function($statement) { |
|
| 199 | + return 'use '.$statement.";\n "; |
|
| 200 | 200 | })->implode(''); |
| 201 | 201 | } |
| 202 | 202 | |
@@ -215,12 +215,12 @@ discard block |
||
| 215 | 215 | |
| 216 | 216 | // We make an estimated guess based on the project name. At Think Tomorrow, we |
| 217 | 217 | // have a src folder which is PSR-4 namespaced by the project name itself. |
| 218 | - return str_replace('\\\\', '\\', ucfirst(config('thinktomorrow.chief.domain.namespace', 'App')) . '\\' . ucfirst($this->plural)); |
|
| 218 | + return str_replace('\\\\', '\\', ucfirst(config('thinktomorrow.chief.domain.namespace', 'App')).'\\'.ucfirst($this->plural)); |
|
| 219 | 219 | } |
| 220 | 220 | |
| 221 | 221 | private function addToConfig($configKey, $value) |
| 222 | 222 | { |
| 223 | - $current_values = config('thinktomorrow.chief.' . $configKey); |
|
| 223 | + $current_values = config('thinktomorrow.chief.'.$configKey); |
|
| 224 | 224 | |
| 225 | 225 | if (is_array($current_values)) { |
| 226 | 226 | $value = array_merge($current_values, $value); |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | |
| 236 | 236 | // Find value - note: this regex does not work for nested arrays! |
| 237 | 237 | // Also creates array with the non-short syntax. |
| 238 | - $content = preg_replace('/[\'|"]' . $key . '[\'|"] ?=> ?(\[[^\]]*\]|[\'|"].*[\'|"])/', var_export($value, true), $content); |
|
| 238 | + $content = preg_replace('/[\'|"]'.$key.'[\'|"] ?=> ?(\[[^\]]*\]|[\'|"].*[\'|"])/', var_export($value, true), $content); |
|
| 239 | 239 | |
| 240 | 240 | file_put_contents($file, $content); |
| 241 | 241 | } |
@@ -81,7 +81,7 @@ |
||
| 81 | 81 | $this->addModelToCollection($i, $child); |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | - return $this->sets->values()->map(function (ViewableContract $child) { |
|
| 84 | + return $this->sets->values()->map(function(ViewableContract $child) { |
|
| 85 | 85 | return ($this->withSnippets && method_exists($child, 'withSnippets')) |
| 86 | 86 | ? $child->withSnippets()->setViewParent($this->parent)->renderView() |
| 87 | 87 | : $child->setViewParent($this->parent)->renderView(); |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | continue; |
| 189 | 189 | } |
| 190 | 190 | |
| 191 | - $child = $children->first(function ($c) use ($reference) { |
|
| 191 | + $child = $children->first(function($c) use ($reference) { |
|
| 192 | 192 | return $c->flatReference()->get() == $reference; |
| 193 | 193 | }); |
| 194 | 194 | |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | private function stripTagsBlacklist($value, $blacklist = []) |
| 240 | 240 | { |
| 241 | 241 | foreach ($blacklist as $tag) { |
| 242 | - $value = preg_replace('/<\/?' . $tag . '(.|\s)*?>/', '', $value); |
|
| 242 | + $value = preg_replace('/<\/?'.$tag.'(.|\s)*?>/', '', $value); |
|
| 243 | 243 | } |
| 244 | 244 | |
| 245 | 245 | return $value; |
@@ -47,8 +47,8 @@ discard block |
||
| 47 | 47 | { |
| 48 | 48 | $requestInput = request()->all(); |
| 49 | 49 | |
| 50 | - return array_reduce($this->all(), function ($carry, Filter $filter) use ($requestInput) { |
|
| 51 | - return $carry . $filter->render($requestInput); |
|
| 50 | + return array_reduce($this->all(), function($carry, Filter $filter) use ($requestInput) { |
|
| 51 | + return $carry.$filter->render($requestInput); |
|
| 52 | 52 | }, ''); |
| 53 | 53 | } |
| 54 | 54 | |
@@ -64,14 +64,14 @@ discard block |
||
| 64 | 64 | |
| 65 | 65 | public function keys(): array |
| 66 | 66 | { |
| 67 | - return array_map(function (Filter $filter) { |
|
| 67 | + return array_map(function(Filter $filter) { |
|
| 68 | 68 | return $filter->key(); |
| 69 | 69 | }, $this->filters); |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | private function validateFilters(array $filters) |
| 73 | 73 | { |
| 74 | - array_map(function (Filter $filter) { |
|
| 74 | + array_map(function(Filter $filter) { |
|
| 75 | 75 | }, $filters); |
| 76 | 76 | } |
| 77 | 77 | |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | public function offsetSet($offset, $value) |
| 98 | 98 | { |
| 99 | 99 | if (!$value instanceof Filter) { |
| 100 | - throw new \InvalidArgumentException('Passed value must be of type ' . Filter::class); |
|
| 100 | + throw new \InvalidArgumentException('Passed value must be of type '.Filter::class); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | $this->filters[$offset] = $value; |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | |
| 116 | 116 | private function sanitizeFilters(array $filters) |
| 117 | 117 | { |
| 118 | - return array_map(function ($filter) { |
|
| 118 | + return array_map(function($filter) { |
|
| 119 | 119 | if (is_string($filter) && class_exists($filter)) { |
| 120 | 120 | return $filter::init(); |
| 121 | 121 | } |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | public function render(array $requestInput = []): string |
| 50 | 50 | { |
| 51 | - $path = $this->viewpath ?? 'chief::back._filters.' . $this->type; |
|
| 51 | + $path = $this->viewpath ?? 'chief::back._filters.'.$this->type; |
|
| 52 | 52 | $this->default($requestInput[$this->name] ?? null); |
| 53 | 53 | |
| 54 | 54 | return view($path, ['filter' => $this])->render(); |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | if (!in_array($name, ['name', 'label', 'description', 'query', 'viewpath', 'default'])) { |
| 65 | - throw new \InvalidArgumentException('Cannot set value by [' . $name . '].'); |
|
| 65 | + throw new \InvalidArgumentException('Cannot set value by ['.$name.'].'); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | $this->values[$name] = $arguments[0]; |