@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | public static function fromKeys($keys) |
| 21 | 21 | { |
| 22 | - $keys = (array) $keys; |
|
| 22 | + $keys = (array)$keys; |
|
| 23 | 23 | $collection = collect(); |
| 24 | 24 | |
| 25 | 25 | /** @var Managers */ |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | public static function fromTags($tags) |
| 35 | 35 | { |
| 36 | - $tags = (array) $tags; |
|
| 36 | + $tags = (array)$tags; |
|
| 37 | 37 | $collection = collect(); |
| 38 | 38 | |
| 39 | 39 | /** @var Managers */ |
@@ -52,9 +52,9 @@ discard block |
||
| 52 | 52 | |
| 53 | 53 | private static function fromManagers(Collection $collection) |
| 54 | 54 | { |
| 55 | - return new static(...$collection->reject(function ($manager) { |
|
| 55 | + return new static(...$collection->reject(function($manager) { |
|
| 56 | 56 | return !$manager->can('index'); |
| 57 | - })->map(function ($manager) { |
|
| 57 | + })->map(function($manager) { |
|
| 58 | 58 | return new NavItem($manager->details()->plural, $manager->route('index'), [ |
| 59 | 59 | 'key' => $manager->details()->key, |
| 60 | 60 | 'tags' => app(Register::class)->filterByKey($manager->details()->key)->first()->tags() |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | |
| 65 | 65 | public function rejectKeys($keys) |
| 66 | 66 | { |
| 67 | - $keys = (array) $keys; |
|
| 67 | + $keys = (array)$keys; |
|
| 68 | 68 | |
| 69 | 69 | foreach ($this->items as $k => $item) { |
| 70 | 70 | if (in_array($item->details('key', ''), $keys)) { |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | public function rejectTags($tags) |
| 79 | 79 | { |
| 80 | - $tags = (array) $tags; |
|
| 80 | + $tags = (array)$tags; |
|
| 81 | 81 | |
| 82 | 82 | foreach ($this->items as $k => $item) { |
| 83 | 83 | if (count(array_intersect($item->details('tags', []), $tags)) > 0) { |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | $output = ''; |
| 120 | 120 | |
| 121 | 121 | foreach ($this->items as $item) { |
| 122 | - $output .= '<a class="' . (isActiveUrl($item->url()) ? 'active' : '') . '" href="'.$item->url().'">'; |
|
| 122 | + $output .= '<a class="'.(isActiveUrl($item->url()) ? 'active' : '').'" href="'.$item->url().'">'; |
|
| 123 | 123 | $output .= $title ?? ucfirst($item->title()); |
| 124 | 124 | $output .= '</a>'; |
| 125 | 125 | } |
@@ -146,14 +146,14 @@ discard block |
||
| 146 | 146 | |
| 147 | 147 | $items = ''; |
| 148 | 148 | foreach ($this->items as $item) { |
| 149 | - $items .= '<a class="' . (isActiveUrl($item->url()) ? 'active' : '') . '" href="'.$item->url().'">'; |
|
| 149 | + $items .= '<a class="'.(isActiveUrl($item->url()) ? 'active' : '').'" href="'.$item->url().'">'; |
|
| 150 | 150 | $items .= ucfirst($item->title()); |
| 151 | 151 | $items .= '</a>'; |
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 154 | // Surround within vue dropdown |
| 155 | 155 | $output = '<dropdown>'; |
| 156 | - $output .= '<span class="center-y nav-item" slot="trigger" slot-scope="{ toggle, isActive }" @click="toggle">'. ($title ?? 'Collecties') .'</span>'; |
|
| 156 | + $output .= '<span class="center-y nav-item" slot="trigger" slot-scope="{ toggle, isActive }" @click="toggle">'.($title ?? 'Collecties').'</span>'; |
|
| 157 | 157 | $output .= '<div v-cloak class="dropdown-box inset-s">'; |
| 158 | 158 | $output .= $items; |
| 159 | 159 | $output .= '</div>'; |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | { |
| 54 | 54 | foreach ($flatReferences as $locale => $flatReferenceString) { |
| 55 | 55 | if (!$flatReferenceString) { |
| 56 | - throw new \InvalidArgumentException('Homepage setting value cannot be empty. Value for locale ' . $locale . ' is missing.'); |
|
| 56 | + throw new \InvalidArgumentException('Homepage setting value cannot be empty. Value for locale '.$locale.' is missing.'); |
|
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | } |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | // prepend the name with the expected trans.<locale>. string |
| 28 | 28 | $localizedAttr = (false !== strpos($attr, ':locale')) |
| 29 | 29 | ? str_replace(':locale', $locale, $attr) |
| 30 | - : 'trans.' . $locale . '.' . $attr; |
|
| 30 | + : 'trans.'.$locale.'.'.$attr; |
|
| 31 | 31 | |
| 32 | 32 | $localizedAttr = $this->replaceBracketsByDots($localizedAttr); |
| 33 | 33 | |
@@ -49,13 +49,13 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | public function influenceByPayload(array $data) |
| 51 | 51 | { |
| 52 | - if (! isset($data['trans'])) { |
|
| 52 | + if (!isset($data['trans'])) { |
|
| 53 | 53 | return $this; |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | // Remove locales that are considered empty in the request payload |
| 57 | 57 | foreach ($data['trans'] as $locale => $values) { |
| 58 | - if ($locale == $this->defaultLocale || ! is_array_empty($values)) { |
|
| 58 | + if ($locale == $this->defaultLocale || !is_array_empty($values)) { |
|
| 59 | 59 | continue; |
| 60 | 60 | } |
| 61 | 61 | |
@@ -15,21 +15,21 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | public static function allOnlineModels(bool $onlySingles = false): array |
| 17 | 17 | { |
| 18 | - return chiefMemoize('all-online-models', function () use ($onlySingles) { |
|
| 18 | + return chiefMemoize('all-online-models', function() use ($onlySingles) { |
|
| 19 | 19 | $builder = UrlRecord::whereNull('redirect_id')->select('model_type', 'model_id')->groupBy('model_type', 'model_id'); |
| 20 | 20 | |
| 21 | 21 | if ($onlySingles) { |
| 22 | 22 | $builder->where('model_type', 'singles'); |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | - $liveUrlRecords = $builder->get()->mapToGroups(function ($record) { |
|
| 25 | + $liveUrlRecords = $builder->get()->mapToGroups(function($record) { |
|
| 26 | 26 | return [$record->model_type => $record->model_id]; |
| 27 | 27 | }); |
| 28 | 28 | |
| 29 | 29 | // Get model for each of these records... |
| 30 | - $models = $liveUrlRecords->map(function ($record, $key) { |
|
| 30 | + $models = $liveUrlRecords->map(function($record, $key) { |
|
| 31 | 31 | return Morphables::instance($key)->find($record->toArray()); |
| 32 | - })->map->reject(function ($model) { |
|
| 32 | + })->map->reject(function($model) { |
|
| 33 | 33 | // Invalid references to archived or removed models where url record still exists. |
| 34 | 34 | return is_null($model) || !$model->isPublished(); |
| 35 | 35 | })->flatten(); |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | $builder->orderBy('updated_at', 'DESC'); |
| 79 | 79 | |
| 80 | - return $builder->get()->map(function ($model) { |
|
| 80 | + return $builder->get()->map(function($model) { |
|
| 81 | 81 | return (new static($this->registration))->manage($model); |
| 82 | 82 | }); |
| 83 | 83 | } |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | |
| 146 | 146 | public function guard($verb): Manager |
| 147 | 147 | { |
| 148 | - if (! $this->can($verb)) { |
|
| 148 | + if (!$this->can($verb)) { |
|
| 149 | 149 | NotAllowedManagerRoute::notAllowedVerb($verb, $this); |
| 150 | 150 | } |
| 151 | 151 | |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | $fields = $this->fields(); |
| 169 | 169 | |
| 170 | 170 | foreach ($this->assistants() as $assistant) { |
| 171 | - if (! method_exists($assistant, 'fields')) { |
|
| 171 | + if (!method_exists($assistant, 'fields')) { |
|
| 172 | 172 | continue; |
| 173 | 173 | } |
| 174 | 174 | |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | return static::$managedModelKey; |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - throw new \Exception('Missing required static property \'managedModelKey\' on ' . static::class. '.'); |
|
| 86 | + throw new \Exception('Missing required static property \'managedModelKey\' on '.static::class.'.'); |
|
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | /** |
@@ -123,9 +123,9 @@ discard block |
||
| 123 | 123 | public function flatReferenceLabel(): string |
| 124 | 124 | { |
| 125 | 125 | if ($this->exists) { |
| 126 | - $status = ! $this->isPublished() ? ' [' . $this->statusAsPlainLabel().']' : null; |
|
| 126 | + $status = !$this->isPublished() ? ' ['.$this->statusAsPlainLabel().']' : null; |
|
| 127 | 127 | |
| 128 | - return $this->title ? $this->title . $status : ''; |
|
| 128 | + return $this->title ? $this->title.$status : ''; |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | return ''; |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | // What was the creator of the assetlibrary package thinking. It sure wasn't me... I promise... |
| 146 | 146 | $assets = $this->getAllFiles($type, app()->getLocale())->map->getFileUrl(); |
| 147 | 147 | |
| 148 | - if($assets->first() == null) |
|
| 148 | + if ($assets->first() == null) |
|
| 149 | 149 | { |
| 150 | 150 | $assets = $this->getAllFiles($type)->map->getFileUrl(); |
| 151 | 151 | } |
@@ -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 | |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | $builder = $model->assets()->where('asset_pivots.type', $this->key()); |
| 45 | 45 | |
| 46 | - if($locale) { |
|
| 46 | + if ($locale) { |
|
| 47 | 47 | $builder = $builder->where('asset_pivots.locale', $locale); |
| 48 | 48 | } |
| 49 | 49 | |
@@ -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 | |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | $builder = $model->assets()->where('asset_pivots.type', $this->key()); |
| 45 | 45 | |
| 46 | - if($locale) { |
|
| 46 | + if ($locale) { |
|
| 47 | 47 | $builder = $builder->where('asset_pivots.locale', $locale); |
| 48 | 48 | } |
| 49 | 49 | foreach ($builder->get() as $asset) { |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | // When no files are uploaded, we still would like to sort our assets duh |
| 27 | 27 | if (empty($files_by_type)) { |
| 28 | - foreach($files_order_by_type as $type => $fileIdsCollection){ |
|
| 28 | + foreach ($files_order_by_type as $type => $fileIdsCollection) { |
|
| 29 | 29 | $this->sortFiles($model, $type, $fileIdsCollection); |
| 30 | 30 | } |
| 31 | 31 | |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | |
| 35 | 35 | foreach ($files_by_type as $type => $files) { |
| 36 | 36 | |
| 37 | - foreach($files as $locale => $files) |
|
| 37 | + foreach ($files as $locale => $files) |
|
| 38 | 38 | { |
| 39 | 39 | $this->validateFileUploads($files); |
| 40 | 40 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | if (is_string($file)) { |
| 55 | 55 | $image_name = json_decode($file)->output->name; |
| 56 | 56 | $asset = $this->addAsset(json_decode($file)->output->image, $type, $locale, $image_name, $model); |
| 57 | - } else { |
|
| 57 | + }else { |
|
| 58 | 58 | $image_name = $file->getClientOriginalName(); |
| 59 | 59 | $asset = $this->addAsset($file, $type, $locale, $image_name, $model); |
| 60 | 60 | } |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | if (is_string($file)) { |
| 79 | 79 | $asset = AssetUploader::uploadFromBase64($file, $filename); |
| 80 | - } else { |
|
| 80 | + }else { |
|
| 81 | 81 | $asset = AssetUploader::upload($file, $filename); |
| 82 | 82 | } |
| 83 | 83 | |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | private function handleFiles(string $action, HasMedia $model, string $type = null, array $files, array $files_order = [], string $locale = null) |
| 115 | 115 | { |
| 116 | 116 | if (isset($files[$action]) && is_array($files[$action]) && !empty($files[$action])) { |
| 117 | - if($action == 'delete') |
|
| 117 | + if ($action == 'delete') |
|
| 118 | 118 | { |
| 119 | 119 | foreach ($model->assets()->whereIn('id', $files[$action])->get() as $asset) { |
| 120 | 120 | $asset->delete(); |
@@ -127,10 +127,10 @@ discard block |
||
| 127 | 127 | continue; |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | - if($action == 'new') |
|
| 130 | + if ($action == 'new') |
|
| 131 | 131 | { |
| 132 | 132 | $this->addFile($model, $type, $files_order, $file, $locale); |
| 133 | - }elseif($action == 'replace') |
|
| 133 | + }elseif ($action == 'replace') |
|
| 134 | 134 | { |
| 135 | 135 | $asset = AssetUploader::uploadFromBase64(json_decode($file)->output->image, json_decode($file)->output->name); |
| 136 | 136 | $model->replaceAsset($id, $asset->id); |
@@ -145,9 +145,9 @@ discard block |
||
| 145 | 145 | */ |
| 146 | 146 | private function sluggifyFilename($filename): string |
| 147 | 147 | { |
| 148 | - $extension = substr($filename, strrpos($filename, '.') + 1); |
|
| 148 | + $extension = substr($filename, strrpos($filename, '.')+1); |
|
| 149 | 149 | $filename = substr($filename, 0, strrpos($filename, '.')); |
| 150 | - $filename = str_slug($filename) . '.' . $extension; |
|
| 150 | + $filename = str_slug($filename).'.'.$extension; |
|
| 151 | 151 | |
| 152 | 152 | return $filename; |
| 153 | 153 | } |
@@ -163,9 +163,9 @@ discard block |
||
| 163 | 163 | if ($file instanceof UploadedFile && !$file->isValid()) { |
| 164 | 164 | if ($file->getError() == UPLOAD_ERR_INI_SIZE) { |
| 165 | 165 | throw new FileTooBigException( |
| 166 | - 'Cannot upload file because it exceeded the allowed upload_max_filesize: upload_max_filesize is smaller than post size. ' . |
|
| 167 | - 'upload_max_filesize: ' . (int)ini_get('upload_max_filesize') . 'MB, ' . |
|
| 168 | - 'post_max_size: ' . (int)(ini_get('post_max_size')) . 'MB' |
|
| 166 | + 'Cannot upload file because it exceeded the allowed upload_max_filesize: upload_max_filesize is smaller than post size. '. |
|
| 167 | + 'upload_max_filesize: '.(int)ini_get('upload_max_filesize').'MB, '. |
|
| 168 | + 'post_max_size: '.(int)(ini_get('post_max_size')).'MB' |
|
| 169 | 169 | ); |
| 170 | 170 | } |
| 171 | 171 | } |
@@ -177,31 +177,31 @@ discard block |
||
| 177 | 177 | { |
| 178 | 178 | $actions = ['new', 'replace', 'delete']; |
| 179 | 179 | |
| 180 | - foreach($files_by_type as $type => $files) |
|
| 180 | + foreach ($files_by_type as $type => $files) |
|
| 181 | 181 | { |
| 182 | - foreach($files as $locale => $_files){ |
|
| 183 | - if(!in_array($locale, config('translatable.locales'))) { |
|
| 184 | - throw new \InvalidArgumentException('Corrupt file payload. key is expected to be a valid locale [' . implode(',', config('translatable.locales', [])). ']. Instead [' . $locale . '] is given.'); |
|
| 182 | + foreach ($files as $locale => $_files) { |
|
| 183 | + if (!in_array($locale, config('translatable.locales'))) { |
|
| 184 | + throw new \InvalidArgumentException('Corrupt file payload. key is expected to be a valid locale ['.implode(',', config('translatable.locales', [])).']. Instead ['.$locale.'] is given.'); |
|
| 185 | 185 | } |
| 186 | 186 | |
| 187 | - if(!is_array($_files)) { |
|
| 188 | - 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.'); |
|
| 187 | + if (!is_array($_files)) { |
|
| 188 | + 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.'); |
|
| 189 | 189 | } |
| 190 | 190 | |
| 191 | - foreach($_files as $action => $file) { |
|
| 192 | - if(!in_array($action, $actions)) { |
|
| 193 | - throw new \InvalidArgumentException('A valid files entry should have a key of either ['.implode(',', $actions).']. Instead ' . $action . ' is given.'); |
|
| 191 | + foreach ($_files as $action => $file) { |
|
| 192 | + if (!in_array($action, $actions)) { |
|
| 193 | + throw new \InvalidArgumentException('A valid files entry should have a key of either ['.implode(',', $actions).']. Instead '.$action.' is given.'); |
|
| 194 | 194 | } |
| 195 | 195 | } |
| 196 | 196 | } |
| 197 | 197 | } |
| 198 | 198 | |
| 199 | - foreach($files_order_by_type as $type => $fileIdsCollection) |
|
| 199 | + foreach ($files_order_by_type as $type => $fileIdsCollection) |
|
| 200 | 200 | { |
| 201 | - foreach($fileIdsCollection as $locale => $commaSeparatedFileIds){ |
|
| 201 | + foreach ($fileIdsCollection as $locale => $commaSeparatedFileIds) { |
|
| 202 | 202 | |
| 203 | - if(!in_array($locale, config('translatable.locales'))) { |
|
| 204 | - throw new \InvalidArgumentException('Corrupt file payload. key for the file order is expected to be a valid locale [' . implode(',', config('translatable.locales', [])). ']. Instead [' . $locale . '] is given.'); |
|
| 203 | + if (!in_array($locale, config('translatable.locales'))) { |
|
| 204 | + throw new \InvalidArgumentException('Corrupt file payload. key for the file order is expected to be a valid locale ['.implode(',', config('translatable.locales', [])).']. Instead ['.$locale.'] is given.'); |
|
| 205 | 205 | } |
| 206 | 206 | } |
| 207 | 207 | } |
@@ -211,13 +211,13 @@ discard block |
||
| 211 | 211 | { |
| 212 | 212 | $defaultLocale = config('app.fallback_locale'); |
| 213 | 213 | |
| 214 | - foreach($files_by_type as $type => $files) |
|
| 214 | + foreach ($files_by_type as $type => $files) |
|
| 215 | 215 | { |
| 216 | - foreach($files as $locale => $_files){ |
|
| 217 | - if(!in_array($locale, config('translatable.locales'))) { |
|
| 216 | + foreach ($files as $locale => $_files) { |
|
| 217 | + if (!in_array($locale, config('translatable.locales'))) { |
|
| 218 | 218 | unset($files_by_type[$type][$locale]); |
| 219 | 219 | |
| 220 | - if(!isset($files_by_type[$type][$defaultLocale])) { |
|
| 220 | + if (!isset($files_by_type[$type][$defaultLocale])) { |
|
| 221 | 221 | $files_by_type[$type][$defaultLocale] = []; |
| 222 | 222 | } |
| 223 | 223 | |
@@ -233,14 +233,14 @@ discard block |
||
| 233 | 233 | { |
| 234 | 234 | $defaultLocale = config('app.fallback_locale'); |
| 235 | 235 | |
| 236 | - foreach($files_order_by_type as $type => $fileIdsCollection) |
|
| 236 | + foreach ($files_order_by_type as $type => $fileIdsCollection) |
|
| 237 | 237 | { |
| 238 | - if(!is_array($fileIdsCollection)) { |
|
| 238 | + if (!is_array($fileIdsCollection)) { |
|
| 239 | 239 | $fileIdsCollection = [$defaultLocale => $fileIdsCollection]; |
| 240 | 240 | $files_order_by_type[$type] = $fileIdsCollection; |
| 241 | 241 | } |
| 242 | 242 | |
| 243 | - foreach($fileIdsCollection as $locale => $commaSeparatedFileIds){ |
|
| 243 | + foreach ($fileIdsCollection as $locale => $commaSeparatedFileIds) { |
|
| 244 | 244 | $files_order_by_type[$type][$locale] = explode(',', $commaSeparatedFileIds); |
| 245 | 245 | } |
| 246 | 246 | } |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | { |
| 253 | 253 | $sortedFileIds = []; |
| 254 | 254 | |
| 255 | - foreach($fileIdsCollection as $locale => $fileIds) { |
|
| 255 | + foreach ($fileIdsCollection as $locale => $fileIds) { |
|
| 256 | 256 | $sortedFileIds = array_merge($sortedFileIds, $fileIds); |
| 257 | 257 | } |
| 258 | 258 | |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | { |
| 264 | 264 | $assets = $model->assets()->where('asset_pivots.type', $type)->get(); |
| 265 | 265 | |
| 266 | - foreach($assets as $asset) |
|
| 266 | + foreach ($assets as $asset) |
|
| 267 | 267 | { |
| 268 | 268 | $pivot = $asset->pivot; |
| 269 | 269 | $pivot->order = array_search($asset->id, $sortedAssetIds); |
@@ -130,7 +130,7 @@ |
||
| 130 | 130 | if($action == 'new') |
| 131 | 131 | { |
| 132 | 132 | $this->addFile($model, $type, $files_order, $file, $locale); |
| 133 | - }elseif($action == 'replace') |
|
| 133 | + } elseif($action == 'replace') |
|
| 134 | 134 | { |
| 135 | 135 | $asset = AssetUploader::uploadFromBase64(json_decode($file)->output->image, json_decode($file)->output->name); |
| 136 | 136 | $model->replaceAsset($id, $asset->id); |