@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | private function saveRecord(string $locale, ?string $slug) |
58 | 58 | { |
59 | 59 | // Existing ones for this locale? |
60 | - $nonRedirectsWithSameLocale = $this->existingRecords->filter(function ($record) use ($locale) { |
|
60 | + $nonRedirectsWithSameLocale = $this->existingRecords->filter(function($record) use ($locale) { |
|
61 | 61 | return ( |
62 | 62 | $record->locale == $locale && |
63 | 63 | !$record->isRedirect() |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | |
67 | 67 | // If slug entry is left empty, all existing records will be deleted |
68 | 68 | if (!$slug) { |
69 | - $nonRedirectsWithSameLocale->each(function ($existingRecord) { |
|
69 | + $nonRedirectsWithSameLocale->each(function($existingRecord) { |
|
70 | 70 | $existingRecord->delete(); |
71 | 71 | }); |
72 | 72 | |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | } |
83 | 83 | |
84 | 84 | // Only replace the existing records that differ from the current passed slugs |
85 | - $nonRedirectsWithSameLocale->each(function ($existingRecord) use ($slug) { |
|
85 | + $nonRedirectsWithSameLocale->each(function($existingRecord) use ($slug) { |
|
86 | 86 | if ($existingRecord->slug != $slug) { |
87 | 87 | $existingRecord->replaceAndRedirect(['slug' => $slug]); |
88 | 88 | } |
@@ -127,12 +127,12 @@ discard block |
||
127 | 127 | */ |
128 | 128 | private function deleteIdenticalRedirects($existingRecords, $locale, $slug): void |
129 | 129 | { |
130 | - $existingRecords->filter(function ($record) use ($locale) { |
|
130 | + $existingRecords->filter(function($record) use ($locale) { |
|
131 | 131 | return ( |
132 | 132 | $record->locale == $locale && |
133 | 133 | $record->isRedirect() |
134 | 134 | ); |
135 | - })->each(function ($existingRecord) use ($slug) { |
|
135 | + })->each(function($existingRecord) use ($slug) { |
|
136 | 136 | if ($existingRecord->slug == $slug) { |
137 | 137 | $existingRecord->delete(); |
138 | 138 | } |
@@ -147,11 +147,11 @@ discard block |
||
147 | 147 | |
148 | 148 | // The old homepage url should be removed since this is no longer in effect. |
149 | 149 | // In case of any redirect to this old homepage, the last used redirect is now back in effect. |
150 | - $existingRecords->reject(function ($existingRecord) { |
|
150 | + $existingRecords->reject(function($existingRecord) { |
|
151 | 151 | return ( |
152 | 152 | $existingRecord->model_type == $this->model->getMorphClass() && |
153 | 153 | $existingRecord->model_id == $this->model->id); |
154 | - })->each(function ($existingRecord) { |
|
154 | + })->each(function($existingRecord) { |
|
155 | 155 | |
156 | 156 | // TODO: if there is a redirect to this page, we'll take this one as the new url |
157 | 157 | $existingRecord->delete(); |
@@ -14,7 +14,7 @@ |
||
14 | 14 | */ |
15 | 15 | public static function prepend(ProvidesUrl $model, string $slug, $locale): string |
16 | 16 | { |
17 | - $slugWithBaseSegment = $model->baseUrlSegment($locale) . '/' . $slug; |
|
17 | + $slugWithBaseSegment = $model->baseUrlSegment($locale).'/'.$slug; |
|
18 | 18 | $slugWithBaseSegment = trim($slugWithBaseSegment, '/'); |
19 | 19 | |
20 | 20 | // If slug with base segment is empty string, it means that the passed slug was probably a "/" character. |
@@ -25,10 +25,10 @@ discard block |
||
25 | 25 | |
26 | 26 | public function manager(Manager $manager) |
27 | 27 | { |
28 | - $this->manager = $manager; |
|
28 | + $this->manager = $manager; |
|
29 | 29 | |
30 | - if (! $manager->model() instanceof ProvidesUrl) { |
|
31 | - throw new \Exception('UrlAssistant requires the model interfaced by ' . ProvidesUrl::class . '.'); |
|
30 | + if (!$manager->model() instanceof ProvidesUrl) { |
|
31 | + throw new \Exception('UrlAssistant requires the model interfaced by '.ProvidesUrl::class.'.'); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | $this->model = $manager->model(); |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | 'url-slugs.*' => 'taalspecifieke link', |
64 | 64 | ]) |
65 | 65 | ->view('chief::back._fields.url-slugs') |
66 | - ->viewData(['fields' => UrlSlugFields::fromModel($this->model) ]), |
|
66 | + ->viewData(['fields' => UrlSlugFields::fromModel($this->model)]), |
|
67 | 67 | ]); |
68 | 68 | } |
69 | 69 | |
@@ -73,9 +73,9 @@ discard block |
||
73 | 73 | |
74 | 74 | // Push update to homepage setting value |
75 | 75 | // TODO: we should just fetch the homepages and push that instead... |
76 | - UrlRecord::getByModel($this->model)->reject(function ($record) { |
|
76 | + UrlRecord::getByModel($this->model)->reject(function($record) { |
|
77 | 77 | return ($record->isRedirect() || !$record->isHomepage()); |
78 | - })->each(function ($record) { |
|
78 | + })->each(function($record) { |
|
79 | 79 | app(ChangeHomepage::class)->onUrlChanged($record); |
80 | 80 | }); |
81 | 81 | } |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | $empty = true; |
75 | 75 | |
76 | 76 | foreach ($values as $value) { |
77 | - if (! $value || !trim($value)) { |
|
77 | + if (!$value || !trim($value)) { |
|
78 | 78 | continue; |
79 | 79 | } |
80 | 80 | $empty = false; |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | } |
85 | 85 | } |
86 | 86 | |
87 | -if (! function_exists('contract')) { |
|
87 | +if (!function_exists('contract')) { |
|
88 | 88 | function contract($instance, $contract) |
89 | 89 | { |
90 | 90 | return $instance instanceof $contract; |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | $text = cleanupHTML($text, $clean); |
114 | 114 | } |
115 | 115 | $teaser = substr($text, 0, $max); |
116 | - return strlen($text) <= $max ? $teaser : $teaser . $ending; |
|
116 | + return strlen($text) <= $max ? $teaser : $teaser.$ending; |
|
117 | 117 | } |
118 | 118 | } |
119 | 119 | |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | * htmlPurifier converts characters to their encode equivalents. This is something |
172 | 172 | * that we need to reverse after the htmlPurifier cleanup. |
173 | 173 | */ |
174 | - $value = str_replace('&', '&', $value); |
|
174 | + $value = str_replace('&', '&', $value); |
|
175 | 175 | |
176 | 176 | return $value; |
177 | 177 | } |
@@ -239,16 +239,16 @@ discard block |
||
239 | 239 | 'scheme', 'host', 'port', 'path', 'query', 'fragment' |
240 | 240 | ], null), $parsed_url, $overrides); |
241 | 241 | |
242 | - $scheme = $parsed_url['scheme'] ? $parsed_url['scheme'] . '://' : null; |
|
243 | - $port = $parsed_url['port'] ? ':' . $parsed_url['port'] : null; |
|
244 | - $fragment = $parsed_url['fragment'] ? '#' . $parsed_url['fragment'] : null; |
|
242 | + $scheme = $parsed_url['scheme'] ? $parsed_url['scheme'].'://' : null; |
|
243 | + $port = $parsed_url['port'] ? ':'.$parsed_url['port'] : null; |
|
244 | + $fragment = $parsed_url['fragment'] ? '#'.$parsed_url['fragment'] : null; |
|
245 | 245 | |
246 | - $baseurl = $scheme . $parsed_url['host'] . $port . $parsed_url['path']; |
|
246 | + $baseurl = $scheme.$parsed_url['host'].$port.$parsed_url['path']; |
|
247 | 247 | $current_query = []; |
248 | 248 | |
249 | 249 | $_query = explode('&', $parsed_url['query']); |
250 | 250 | |
251 | - array_map(function ($v) use (&$current_query) { |
|
251 | + array_map(function($v) use (&$current_query) { |
|
252 | 252 | if (!$v) { |
253 | 253 | return; |
254 | 254 | } |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | |
267 | 267 | $query = urldecode(http_build_query(array_merge($current_query, $query_params))); |
268 | 268 | |
269 | - return $baseurl . '?' . $query . $fragment; |
|
269 | + return $baseurl.'?'.$query.$fragment; |
|
270 | 270 | } |
271 | 271 | } |
272 | 272 |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | return static::$managedModelKey; |
85 | 85 | } |
86 | 86 | |
87 | - throw new \Exception('Missing required static property \'managedModelKey\' on ' . static::class. '.'); |
|
87 | + throw new \Exception('Missing required static property \'managedModelKey\' on '.static::class.'.'); |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | /** |
@@ -124,9 +124,9 @@ discard block |
||
124 | 124 | public function flatReferenceLabel(): string |
125 | 125 | { |
126 | 126 | if ($this->exists) { |
127 | - $status = ! $this->isPublished() ? ' [' . $this->statusAsPlainLabel().']' : null; |
|
127 | + $status = !$this->isPublished() ? ' ['.$this->statusAsPlainLabel().']' : null; |
|
128 | 128 | |
129 | - return $this->title ? $this->title . $status : ''; |
|
129 | + return $this->title ? $this->title.$status : ''; |
|
130 | 130 | } |
131 | 131 | |
132 | 132 | return ''; |
@@ -136,8 +136,8 @@ discard block |
||
136 | 136 | { |
137 | 137 | $classKey = get_class($this); |
138 | 138 | if (property_exists($this, 'labelSingular')) { |
139 | - $labelSingular = $this->labelSingular; |
|
140 | - } else { |
|
139 | + $labelSingular = $this->labelSingular; |
|
140 | + }else { |
|
141 | 141 | $labelSingular = Str::singular($classKey); |
142 | 142 | } |
143 | 143 |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types = 1); |
|
3 | +declare(strict_types=1); |
|
4 | 4 | |
5 | 5 | namespace Thinktomorrow\Chief\Fields\Types; |
6 | 6 | |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | |
72 | 72 | public function optional(): bool |
73 | 73 | { |
74 | - return ! $this->required(); |
|
74 | + return !$this->required(); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | public function name(string $name = null) |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | |
147 | 147 | private function defaultValueResolver(): callable |
148 | 148 | { |
149 | - return function (Model $model, $locale) { |
|
149 | + return function(Model $model, $locale) { |
|
150 | 150 | if ($this->isTranslatable() && $locale) { |
151 | 151 | return $model->getTranslationFor($this->column(), $locale); |
152 | 152 | } |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | } |
215 | 215 | |
216 | 216 | if (!in_array($name, ['label', 'key', 'description', 'column', 'name', 'prepend', 'append'])) { |
217 | - throw new \InvalidArgumentException('Cannot set value by ['. $name .'].'); |
|
217 | + throw new \InvalidArgumentException('Cannot set value by ['.$name.'].'); |
|
218 | 218 | } |
219 | 219 | |
220 | 220 | $this->values[$name] = $arguments[0]; |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | return $this->indexPagination($builder); |
85 | 85 | } |
86 | 86 | |
87 | - return $builder->get()->map(function ($model) { |
|
87 | + return $builder->get()->map(function($model) { |
|
88 | 88 | return (new static($this->registration))->manage($model); |
89 | 89 | }); |
90 | 90 | } |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | { |
113 | 113 | $paginator = $builder->paginate($this->pageCount); |
114 | 114 | |
115 | - $modifiedCollection = $builder->paginate($this->pageCount)->getCollection()->transform(function ($model) { |
|
115 | + $modifiedCollection = $builder->paginate($this->pageCount)->getCollection()->transform(function($model) { |
|
116 | 116 | return (new static($this->registration))->manage($model); |
117 | 117 | }); |
118 | 118 | |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | |
187 | 187 | public function guard($verb): Manager |
188 | 188 | { |
189 | - if (! $this->can($verb)) { |
|
189 | + if (!$this->can($verb)) { |
|
190 | 190 | NotAllowedManagerRoute::notAllowedVerb($verb, $this); |
191 | 191 | } |
192 | 192 | |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | $fields = $this->fields(); |
210 | 210 | |
211 | 211 | foreach ($this->assistants() as $assistant) { |
212 | - if (! method_exists($assistant, 'fields')) { |
|
212 | + if (!method_exists($assistant, 'fields')) { |
|
213 | 213 | continue; |
214 | 214 | } |
215 | 215 | |
@@ -291,9 +291,9 @@ discard block |
||
291 | 291 | static::$bootedTraitMethods[$baseMethod] = []; |
292 | 292 | |
293 | 293 | foreach (class_uses_recursive($class) as $trait) { |
294 | - $method = class_basename($trait) . ucfirst($baseMethod); |
|
294 | + $method = class_basename($trait).ucfirst($baseMethod); |
|
295 | 295 | |
296 | - if (method_exists($class, $method) && ! in_array($method, static::$bootedTraitMethods[$baseMethod])) { |
|
296 | + if (method_exists($class, $method) && !in_array($method, static::$bootedTraitMethods[$baseMethod])) { |
|
297 | 297 | static::$bootedTraitMethods[$baseMethod][] = lcfirst($method); |
298 | 298 | } |
299 | 299 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | if (isset(json_decode($file)->output)) { |
114 | 114 | $image_name = json_decode($file)->output->name; |
115 | 115 | $asset = app(AddAsset::class)->add($model, json_decode($file)->output->image, $type, $locale, $this->sluggifyFilename($image_name)); |
116 | - } else { |
|
116 | + }else { |
|
117 | 117 | if ($file instanceof UploadedFile) { |
118 | 118 | $image_name = $file->getClientOriginalName(); |
119 | 119 | $asset = app(AddAsset::class)->add($model, $file, $type, $locale, $this->sluggifyFilename($image_name)); |
@@ -121,9 +121,9 @@ discard block |
||
121 | 121 | // New files are passed with their filename (instead of their id) |
122 | 122 | // For new files we will replace the filename with the id. |
123 | 123 | if (false !== ($key = array_search($image_name, $files_order))) { |
124 | - $files_order[$key] = (string) $asset->id; |
|
124 | + $files_order[$key] = (string)$asset->id; |
|
125 | 125 | } |
126 | - } else { |
|
126 | + }else { |
|
127 | 127 | $file = Asset::findOrFail($file); |
128 | 128 | $asset = app(AddAsset::class)->add($model, $file, $type, $locale); |
129 | 129 | } |
@@ -136,9 +136,9 @@ discard block |
||
136 | 136 | */ |
137 | 137 | private function sluggifyFilename($filename): string |
138 | 138 | { |
139 | - $extension = substr($filename, strrpos($filename, '.') + 1); |
|
139 | + $extension = substr($filename, strrpos($filename, '.')+1); |
|
140 | 140 | $filename = substr($filename, 0, strrpos($filename, '.')); |
141 | - $filename = Str::slug($filename) . '.' . $extension; |
|
141 | + $filename = Str::slug($filename).'.'.$extension; |
|
142 | 142 | |
143 | 143 | return $filename; |
144 | 144 | } |
@@ -154,9 +154,9 @@ discard block |
||
154 | 154 | if ($file instanceof UploadedFile && !$file->isValid()) { |
155 | 155 | if ($file->getError() == UPLOAD_ERR_INI_SIZE) { |
156 | 156 | throw new FileTooBigException( |
157 | - 'Cannot upload file because it exceeded the allowed upload_max_filesize: upload_max_filesize is smaller than post size. ' . |
|
158 | - 'upload_max_filesize: ' . (int)ini_get('upload_max_filesize') . 'MB, ' . |
|
159 | - 'post_max_size: ' . (int)(ini_get('post_max_size')) . 'MB' |
|
157 | + 'Cannot upload file because it exceeded the allowed upload_max_filesize: upload_max_filesize is smaller than post size. '. |
|
158 | + 'upload_max_filesize: '.(int)ini_get('upload_max_filesize').'MB, '. |
|
159 | + 'post_max_size: '.(int)(ini_get('post_max_size')).'MB' |
|
160 | 160 | ); |
161 | 161 | } |
162 | 162 | } |
@@ -170,16 +170,16 @@ discard block |
||
170 | 170 | foreach ($files_by_type as $type => $files) { |
171 | 171 | foreach ($files as $locale => $_files) { |
172 | 172 | if (!in_array($locale, config('translatable.locales'))) { |
173 | - throw new \InvalidArgumentException('Corrupt file payload. key is expected to be a valid locale [' . implode(',', config('translatable.locales', [])). ']. Instead [' . $locale . '] is given.'); |
|
173 | + throw new \InvalidArgumentException('Corrupt file payload. key is expected to be a valid locale ['.implode(',', config('translatable.locales', [])).']. Instead ['.$locale.'] is given.'); |
|
174 | 174 | } |
175 | 175 | |
176 | 176 | if (!is_array($_files)) { |
177 | - throw new \InvalidArgumentException('A valid files entry should be an array of files, key with either [new, replace or delete]. Instead a ' . gettype($_files) . ' is given.'); |
|
177 | + throw new \InvalidArgumentException('A valid files entry should be an array of files, key with either [new, replace or delete]. Instead a '.gettype($_files).' is given.'); |
|
178 | 178 | } |
179 | 179 | |
180 | 180 | foreach ($_files as $action => $file) { |
181 | 181 | if (!in_array($action, $actions)) { |
182 | - throw new \InvalidArgumentException('A valid files entry should have a key of either ['.implode(',', $actions).']. Instead ' . $action . ' is given.'); |
|
182 | + throw new \InvalidArgumentException('A valid files entry should have a key of either ['.implode(',', $actions).']. Instead '.$action.' is given.'); |
|
183 | 183 | } |
184 | 184 | } |
185 | 185 | } |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | |
52 | 52 | // If no view has been created for this page collection, we try once again to fetch the content value if any. This will silently fail |
53 | 53 | // if no content value is present. We don't consider the 'content' attribute to be a default as we do for module. |
54 | - return $this->map(function ($item) { |
|
54 | + return $this->map(function($item) { |
|
55 | 55 | return ($this->viewParent && $item instanceof ViewableContract) |
56 | 56 | ? $item->setViewParent($this->viewParent)->renderView() |
57 | 57 | : ($item->content ?? ''); |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | { |
85 | 85 | $currentPage = $currentPage ?? request()->get('page', 1); |
86 | 86 | $path = request()->path(); |
87 | - $items = array_slice($this->all(), ($currentPage - 1) * $perPage); |
|
87 | + $items = array_slice($this->all(), ($currentPage-1) * $perPage); |
|
88 | 88 | |
89 | 89 | return (new \Illuminate\Pagination\Paginator($items, $perPage ?? $this->paginateSetting('perPage', '12'), $currentPage))->setPath($path); |
90 | 90 | } |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | { |
102 | 102 | $currentPage = $currentPage ?? request()->get('page', 1); |
103 | 103 | $path = '/'.request()->path(); |
104 | - $items = array_slice($this->all(), ($currentPage - 1) * $perPage, $perPage); |
|
104 | + $items = array_slice($this->all(), ($currentPage-1) * $perPage, $perPage); |
|
105 | 105 | |
106 | 106 | return (new \Illuminate\Pagination\LengthAwarePaginator($items, $this->paginateSetting('total', $this->count()), $perPage ?? $this->paginateSetting('perPage', '12'), $currentPage))->setPath($path); |
107 | 107 | } |