@@ -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 | |
@@ -275,9 +275,9 @@ discard block |
||
| 275 | 275 | { |
| 276 | 276 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 277 | 277 | if (php_sapi_name() == 'cli') { |
| 278 | - print_r("\e[1;30m dumped at: " . str_replace(base_path(), '', $trace[0]['file']). ", line: " . $trace[0]['line'] . "\e[40m\n"); |
|
| 279 | - } else { |
|
| 280 | - print_r("[dumped at: " . str_replace(base_path(), '', $trace[0]['file']). ", line: " . $trace[0]['line'] . "]\n"); |
|
| 278 | + print_r("\e[1;30m dumped at: ".str_replace(base_path(), '', $trace[0]['file']).", line: ".$trace[0]['line']."\e[40m\n"); |
|
| 279 | + }else { |
|
| 280 | + print_r("[dumped at: ".str_replace(base_path(), '', $trace[0]['file']).", line: ".$trace[0]['line']."]\n"); |
|
| 281 | 281 | } |
| 282 | 282 | return dd($var, ...$moreVars); |
| 283 | 283 | } |
@@ -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 | |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | |
| 67 | 67 | public function optional(): bool |
| 68 | 68 | { |
| 69 | - return ! $this->required(); |
|
| 69 | + return !$this->required(); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | public function name(string $name = null) |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | if (!in_array($name, ['label', 'key', 'description', 'column', 'name', 'prepend', 'append'])) { |
| 198 | - throw new \InvalidArgumentException('Cannot set value by ['. $name .'].'); |
|
| 198 | + throw new \InvalidArgumentException('Cannot set value by ['.$name.'].'); |
|
| 199 | 199 | } |
| 200 | 200 | |
| 201 | 201 | $this->values[$name] = $arguments[0]; |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | |
| 45 | 45 | public static function getByModel(Model $model) |
| 46 | 46 | { |
| 47 | - return chiefMemoize('url-records-get-by-model', function ($model) { |
|
| 47 | + return chiefMemoize('url-records-get-by-model', function($model) { |
|
| 48 | 48 | return parent::getByModel($model); |
| 49 | 49 | }, [$model]); |
| 50 | 50 | } |
@@ -44,11 +44,11 @@ discard block |
||
| 44 | 44 | throw new \DomainException('Corrupt target model for this url request. Model by reference ['.$urlRecord->model_type.'@'.$urlRecord->model_id.'] has probably been archived or deleted.'); |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - if (method_exists($model, 'isPublished') && ! $model->isPublished()) { |
|
| 47 | + if (method_exists($model, 'isPublished') && !$model->isPublished()) { |
|
| 48 | 48 | |
| 49 | 49 | /** When admin is logged in and this request is in preview mode, we allow the view */ |
| 50 | - if (! PreviewMode::fromRequest()->check()) { |
|
| 51 | - throw new NotFoundHttpException('Model found for request ['. $slug .'] but it is not published.'); |
|
| 50 | + if (!PreviewMode::fromRequest()->check()) { |
|
| 51 | + throw new NotFoundHttpException('Model found for request ['.$slug.'] but it is not published.'); |
|
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | 54 | |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | } |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | - throw new NotFoundHttpException('No url or model found for request ['. $slug .'] for locale ['.$locale.'].'); |
|
| 62 | + throw new NotFoundHttpException('No url or model found for request ['.$slug.'] for locale ['.$locale.'].'); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | private static function createRedirect(string $url) |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | */ |
| 40 | 40 | private static function onlineModels(bool $onlySingles = false, Model $ignoredModel = null): Collection |
| 41 | 41 | { |
| 42 | - $models = chiefMemoize('all-online-models', function () use ($onlySingles) { |
|
| 42 | + $models = chiefMemoize('all-online-models', function() use ($onlySingles) { |
|
| 43 | 43 | $builder = UrlRecord::whereNull('redirect_id') |
| 44 | 44 | ->select('model_type', 'model_id') |
| 45 | 45 | ->groupBy('model_type', 'model_id'); |
@@ -48,17 +48,17 @@ discard block |
||
| 48 | 48 | $builder->where('model_type', 'singles'); |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - return $builder->get()->mapToGroups(function ($record) { |
|
| 51 | + return $builder->get()->mapToGroups(function($record) { |
|
| 52 | 52 | return [$record->model_type => $record->model_id]; |
| 53 | - })->map(function ($record, $key) { |
|
| 53 | + })->map(function($record, $key) { |
|
| 54 | 54 | return Morphables::instance($key)->find($record->toArray()); |
| 55 | - })->map->reject(function ($model) { |
|
| 55 | + })->map->reject(function($model) { |
|
| 56 | 56 | return is_null($model) || !$model->isPublished(); // Invalid references to archived or removed models where url record still exists. |
| 57 | 57 | })->flatten(); |
| 58 | 58 | }, [$onlySingles]); |
| 59 | 59 | |
| 60 | 60 | if ($ignoredModel) { |
| 61 | - $models = $models->reject(function ($model) use ($ignoredModel) { |
|
| 61 | + $models = $models->reject(function($model) use ($ignoredModel) { |
|
| 62 | 62 | return (get_class($model) === get_class($ignoredModel) && $model->id === $ignoredModel->id); |
| 63 | 63 | }); |
| 64 | 64 | } |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | if (is_string($file)) { |
| 112 | 112 | $image_name = json_decode($file)->output->name; |
| 113 | 113 | $asset = $this->addAsset(json_decode($file)->output->image, $type, $locale, $image_name, $model); |
| 114 | - } else { |
|
| 114 | + }else { |
|
| 115 | 115 | $image_name = $file->getClientOriginalName(); |
| 116 | 116 | $asset = $this->addAsset($file, $type, $locale, $image_name, $model); |
| 117 | 117 | } |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | // New files are passed with their filename (instead of their id) |
| 120 | 120 | // For new files we will replace the filename with the id. |
| 121 | 121 | if (false !== ($key = array_search($image_name, $files_order))) { |
| 122 | - $files_order[$key] = (string) $asset->id; |
|
| 122 | + $files_order[$key] = (string)$asset->id; |
|
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | |
| 135 | 135 | if (is_string($file)) { |
| 136 | 136 | $asset = AssetUploader::uploadFromBase64($file, $filename); |
| 137 | - } else { |
|
| 137 | + }else { |
|
| 138 | 138 | $asset = AssetUploader::upload($file, $filename); |
| 139 | 139 | } |
| 140 | 140 | |
@@ -151,9 +151,9 @@ discard block |
||
| 151 | 151 | */ |
| 152 | 152 | private function sluggifyFilename($filename): string |
| 153 | 153 | { |
| 154 | - $extension = substr($filename, strrpos($filename, '.') + 1); |
|
| 154 | + $extension = substr($filename, strrpos($filename, '.')+1); |
|
| 155 | 155 | $filename = substr($filename, 0, strrpos($filename, '.')); |
| 156 | - $filename = str_slug($filename) . '.' . $extension; |
|
| 156 | + $filename = str_slug($filename).'.'.$extension; |
|
| 157 | 157 | |
| 158 | 158 | return $filename; |
| 159 | 159 | } |
@@ -169,9 +169,9 @@ discard block |
||
| 169 | 169 | if ($file instanceof UploadedFile && !$file->isValid()) { |
| 170 | 170 | if ($file->getError() == UPLOAD_ERR_INI_SIZE) { |
| 171 | 171 | throw new FileTooBigException( |
| 172 | - 'Cannot upload file because it exceeded the allowed upload_max_filesize: upload_max_filesize is smaller than post size. ' . |
|
| 173 | - 'upload_max_filesize: ' . (int)ini_get('upload_max_filesize') . 'MB, ' . |
|
| 174 | - 'post_max_size: ' . (int)(ini_get('post_max_size')) . 'MB' |
|
| 172 | + 'Cannot upload file because it exceeded the allowed upload_max_filesize: upload_max_filesize is smaller than post size. '. |
|
| 173 | + 'upload_max_filesize: '.(int)ini_get('upload_max_filesize').'MB, '. |
|
| 174 | + 'post_max_size: '.(int)(ini_get('post_max_size')).'MB' |
|
| 175 | 175 | ); |
| 176 | 176 | } |
| 177 | 177 | } |
@@ -185,16 +185,16 @@ discard block |
||
| 185 | 185 | foreach ($files_by_type as $type => $files) { |
| 186 | 186 | foreach ($files as $locale => $_files) { |
| 187 | 187 | if (!in_array($locale, config('translatable.locales'))) { |
| 188 | - throw new \InvalidArgumentException('Corrupt file payload. key is expected to be a valid locale [' . implode(',', config('translatable.locales', [])). ']. Instead [' . $locale . '] is given.'); |
|
| 188 | + throw new \InvalidArgumentException('Corrupt file payload. key is expected to be a valid locale ['.implode(',', config('translatable.locales', [])).']. Instead ['.$locale.'] is given.'); |
|
| 189 | 189 | } |
| 190 | 190 | |
| 191 | 191 | if (!is_array($_files)) { |
| 192 | - 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.'); |
|
| 192 | + 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.'); |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | foreach ($_files as $action => $file) { |
| 196 | 196 | if (!in_array($action, $actions)) { |
| 197 | - throw new \InvalidArgumentException('A valid files entry should have a key of either ['.implode(',', $actions).']. Instead ' . $action . ' is given.'); |
|
| 197 | + throw new \InvalidArgumentException('A valid files entry should have a key of either ['.implode(',', $actions).']. Instead '.$action.' is given.'); |
|
| 198 | 198 | } |
| 199 | 199 | } |
| 200 | 200 | } |
@@ -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 | |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | return $this; |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - return 'files['. ($this->values['name'] ?? $this->key()).']'; |
|
| 43 | + return 'files['.($this->values['name'] ?? $this->key()).']'; |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | public function sluggifyName() |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | return $this->indexPagination($builder); |
| 83 | 83 | } |
| 84 | 84 | |
| 85 | - return $builder->get()->map(function ($model) { |
|
| 85 | + return $builder->get()->map(function($model) { |
|
| 86 | 86 | return (new static($this->registration))->manage($model); |
| 87 | 87 | }); |
| 88 | 88 | } |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | { |
| 111 | 111 | $paginator = $builder->paginate($this->pageCount); |
| 112 | 112 | |
| 113 | - $modifiedCollection = $builder->paginate($this->pageCount)->getCollection()->transform(function ($model) { |
|
| 113 | + $modifiedCollection = $builder->paginate($this->pageCount)->getCollection()->transform(function($model) { |
|
| 114 | 114 | return (new static($this->registration))->manage($model); |
| 115 | 115 | }); |
| 116 | 116 | |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | |
| 181 | 181 | public function guard($verb): Manager |
| 182 | 182 | { |
| 183 | - if (! $this->can($verb)) { |
|
| 183 | + if (!$this->can($verb)) { |
|
| 184 | 184 | NotAllowedManagerRoute::notAllowedVerb($verb, $this); |
| 185 | 185 | } |
| 186 | 186 | |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | $fields = $this->fields(); |
| 204 | 204 | |
| 205 | 205 | foreach ($this->assistants() as $assistant) { |
| 206 | - if (! method_exists($assistant, 'fields')) { |
|
| 206 | + if (!method_exists($assistant, 'fields')) { |
|
| 207 | 207 | continue; |
| 208 | 208 | } |
| 209 | 209 | |