@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | */ |
| 35 | 35 | public function get(): string |
| 36 | 36 | { |
| 37 | - $basePath = $this->viewBasePath ? $this->viewBasePath . '.' : ''; |
|
| 37 | + $basePath = $this->viewBasePath ? $this->viewBasePath.'.' : ''; |
|
| 38 | 38 | $guessedParentViewName = $this->parent ? $this->parent->viewKey() : ''; |
| 39 | 39 | $guessedViewName = $this->viewable->viewKey(); |
| 40 | 40 | |
@@ -53,14 +53,14 @@ discard block |
||
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | foreach ($viewPaths as $viewPath) { |
| 56 | - if (! view()->exists($viewPath)) { |
|
| 56 | + if (!view()->exists($viewPath)) { |
|
| 57 | 57 | continue; |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | return $viewPath; |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | - if (! view()->exists($basePath.'show')) { |
|
| 63 | + if (!view()->exists($basePath.'show')) { |
|
| 64 | 64 | throw new NotFoundView('Viewfile not found for ['.get_class($this->viewable).']. Make sure the view ['.$basePath.$guessedViewName.'] or the default view ['.$basePath.'show] exists.'); |
| 65 | 65 | } |
| 66 | 66 | } |
@@ -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(); |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | public static function redirectsFromModel(ProvidesUrl $model) |
| 20 | 20 | { |
| 21 | - $records = MemoizedUrlRecord::getByModel($model)->reject(function ($record) { |
|
| 21 | + $records = MemoizedUrlRecord::getByModel($model)->reject(function($record) { |
|
| 22 | 22 | return !$record->isRedirect(); |
| 23 | 23 | })->sortByDesc('created_at'); |
| 24 | 24 | |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | $fields[$key] = UrlSlugField::make($key) |
| 30 | 30 | ->setUrlRecord($record) |
| 31 | 31 | ->setBaseUrlSegment($model->baseUrlSegment($record->locale)) |
| 32 | - ->prepend($model->resolveUrl($record->locale, $model->baseUrlSegment($record->locale)) . ($record->slug != '/' ? '/' : '')); |
|
| 32 | + ->prepend($model->resolveUrl($record->locale, $model->baseUrlSegment($record->locale)).($record->slug != '/' ? '/' : '')); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | return $fields; |
@@ -61,10 +61,10 @@ discard block |
||
| 61 | 61 | $fields = new static([]); |
| 62 | 62 | |
| 63 | 63 | foreach ($locales as $locale) { |
| 64 | - $fields['url-slugs.' . $locale] = UrlSlugField::make('url-slugs.' . $locale) |
|
| 64 | + $fields['url-slugs.'.$locale] = UrlSlugField::make('url-slugs.'.$locale) |
|
| 65 | 65 | ->setBaseUrlSegment($model->baseUrlSegment($locale)) |
| 66 | - ->prepend($model->resolveUrl($locale, $model->baseUrlSegment($locale)) .'/') |
|
| 67 | - ->name('url-slugs[' . $locale . ']') |
|
| 66 | + ->prepend($model->resolveUrl($locale, $model->baseUrlSegment($locale)).'/') |
|
| 67 | + ->name('url-slugs['.$locale.']') |
|
| 68 | 68 | ->label($locale); |
| 69 | 69 | } |
| 70 | 70 | |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | */ |
| 78 | 78 | private static function fillWithExistingValues(ProvidesUrl $model, self $fields): void |
| 79 | 79 | { |
| 80 | - $records = UrlRecord::getByModel($model)->reject(function ($record) { |
|
| 80 | + $records = UrlRecord::getByModel($model)->reject(function($record) { |
|
| 81 | 81 | return $record->isRedirect(); |
| 82 | 82 | })->sortBy('locale'); |
| 83 | 83 | |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | $fields['url-slugs.'.$record->locale] |
| 90 | 90 | ->setUrlRecord($record) |
| 91 | 91 | ->setBaseUrlSegment($model->baseUrlSegment($record->locale)) |
| 92 | - ->prepend($model->resolveUrl($record->locale, $model->baseUrlSegment($record->locale)) .'/'); |
|
| 92 | + ->prepend($model->resolveUrl($record->locale, $model->baseUrlSegment($record->locale)).'/'); |
|
| 93 | 93 | } |
| 94 | 94 | } |
| 95 | 95 | } |
@@ -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 | |
@@ -27,9 +27,9 @@ discard block |
||
| 27 | 27 | //TODO check if trans key is present, if so we're saving translatable media |
| 28 | 28 | |
| 29 | 29 | foreach ($files_by_type as $type => $files) { |
| 30 | - if(key_exists('trans', $files)) |
|
| 30 | + if (key_exists('trans', $files)) |
|
| 31 | 31 | { |
| 32 | - foreach($files['trans'] as $locale => $files) |
|
| 32 | + foreach ($files['trans'] as $locale => $files) |
|
| 33 | 33 | { |
| 34 | 34 | $this->validateFileUploads($files); |
| 35 | 35 | |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | $model->sortFiles($type, $files_order); |
| 42 | 42 | } |
| 43 | - }else{ |
|
| 43 | + }else { |
|
| 44 | 44 | $this->validateFileUploads($files); |
| 45 | 45 | |
| 46 | 46 | $files_order = isset($files_order_by_type[$type]) ? explode(',', $files_order_by_type[$type]) : []; |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | if (is_string($file)) { |
| 73 | 73 | $image_name = json_decode($file)->output->name; |
| 74 | 74 | $asset = $this->addAsset(json_decode($file)->output->image, $type, $locale, $image_name, $model); |
| 75 | - } else { |
|
| 75 | + }else { |
|
| 76 | 76 | $image_name = $file->getClientOriginalName(); |
| 77 | 77 | $asset = $this->addAsset($file, $type, $locale, $image_name, $model); |
| 78 | 78 | } |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | |
| 96 | 96 | if (is_string($file)) { |
| 97 | 97 | $asset = AssetUploader::uploadFromBase64($file, $filename); |
| 98 | - } else { |
|
| 98 | + }else { |
|
| 99 | 99 | $asset = AssetUploader::upload($file, $filename); |
| 100 | 100 | } |
| 101 | 101 | |
@@ -141,9 +141,9 @@ discard block |
||
| 141 | 141 | */ |
| 142 | 142 | private function sluggifyFilename($filename): string |
| 143 | 143 | { |
| 144 | - $extension = substr($filename, strrpos($filename, '.') + 1); |
|
| 144 | + $extension = substr($filename, strrpos($filename, '.')+1); |
|
| 145 | 145 | $filename = substr($filename, 0, strrpos($filename, '.')); |
| 146 | - $filename = str_slug($filename) . '.' . $extension; |
|
| 146 | + $filename = str_slug($filename).'.'.$extension; |
|
| 147 | 147 | |
| 148 | 148 | return $filename; |
| 149 | 149 | } |
@@ -159,9 +159,9 @@ discard block |
||
| 159 | 159 | if ($file instanceof UploadedFile && !$file->isValid()) { |
| 160 | 160 | if ($file->getError() == UPLOAD_ERR_INI_SIZE) { |
| 161 | 161 | throw new FileTooBigException( |
| 162 | - 'Cannot upload file because it exceeded the allowed upload_max_filesize: upload_max_filesize is smaller than post size. ' . |
|
| 163 | - 'upload_max_filesize: ' . (int)ini_get('upload_max_filesize') . 'MB, ' . |
|
| 164 | - 'post_max_size: ' . (int)(ini_get('post_max_size')) . 'MB' |
|
| 162 | + 'Cannot upload file because it exceeded the allowed upload_max_filesize: upload_max_filesize is smaller than post size. '. |
|
| 163 | + 'upload_max_filesize: '.(int)ini_get('upload_max_filesize').'MB, '. |
|
| 164 | + 'post_max_size: '.(int)(ini_get('post_max_size')).'MB' |
|
| 165 | 165 | ); |
| 166 | 166 | } |
| 167 | 167 | } |
@@ -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 | |
@@ -46,14 +46,14 @@ discard block |
||
| 46 | 46 | $images = []; |
| 47 | 47 | $builder = $model->assets()->where('asset_pivots.type', $this->key()); |
| 48 | 48 | |
| 49 | - if($locale) { |
|
| 49 | + if ($locale) { |
|
| 50 | 50 | $builder = $builder->where('asset_pivots.locale', $locale); |
| 51 | 51 | } |
| 52 | 52 | // $results = $builder->get(); |
| 53 | 53 | // ddd(DB::getQueryLog(), $results); |
| 54 | 54 | foreach ($builder->get() as $asset) { |
| 55 | 55 | |
| 56 | - if(!isset($images[$asset->pivot->locale])) { |
|
| 56 | + if (!isset($images[$asset->pivot->locale])) { |
|
| 57 | 57 | $images[$asset->pivot->locale] = []; |
| 58 | 58 | } |
| 59 | 59 | |