| @@ -59,7 +59,7 @@ discard block | ||
| 59 | 59 |          if (is_string($file)) { | 
| 60 | 60 | $image_name = json_decode($file)->output->name; | 
| 61 | 61 | $asset = $this->addAsset(json_decode($file)->output->image, $type, null, $image_name, $model); | 
| 62 | -        } else { | |
| 62 | +        }else { | |
| 63 | 63 | $image_name = $file->getClientOriginalName(); | 
| 64 | 64 | $asset = $this->addAsset($file, $type, null, $image_name, $model); | 
| 65 | 65 | } | 
| @@ -82,7 +82,7 @@ discard block | ||
| 82 | 82 | |
| 83 | 83 |          if (is_string($file)) { | 
| 84 | 84 | $asset = AssetUploader::uploadFromBase64($file, $filename); | 
| 85 | -        } else { | |
| 85 | +        }else { | |
| 86 | 86 | $asset = AssetUploader::upload($file, $filename); | 
| 87 | 87 | } | 
| 88 | 88 | |
| @@ -126,9 +126,9 @@ discard block | ||
| 126 | 126 | */ | 
| 127 | 127 | private function sluggifyFilename($filename): string | 
| 128 | 128 |      { | 
| 129 | - $extension = substr($filename, strrpos($filename, '.') + 1); | |
| 129 | + $extension = substr($filename, strrpos($filename, '.')+1); | |
| 130 | 130 | $filename = substr($filename, 0, strrpos($filename, '.')); | 
| 131 | - $filename = str_slug($filename) . '.' . $extension; | |
| 131 | + $filename = str_slug($filename).'.'.$extension; | |
| 132 | 132 | |
| 133 | 133 | return $filename; | 
| 134 | 134 | } | 
| @@ -144,9 +144,9 @@ discard block | ||
| 144 | 144 |                  if ($file instanceof UploadedFile && !$file->isValid()) { | 
| 145 | 145 |                      if ($file->getError() == UPLOAD_ERR_INI_SIZE) { | 
| 146 | 146 | throw new FileTooBigException( | 
| 147 | - 'Cannot upload file because it exceeded the allowed upload_max_filesize: upload_max_filesize is smaller than post size. ' . | |
| 148 | -                            'upload_max_filesize: ' . (int)ini_get('upload_max_filesize') . 'MB, ' . | |
| 149 | -                            'post_max_size: ' . (int)(ini_get('post_max_size')) . 'MB' | |
| 147 | + 'Cannot upload file because it exceeded the allowed upload_max_filesize: upload_max_filesize is smaller than post size. '. | |
| 148 | +                            'upload_max_filesize: '.(int)ini_get('upload_max_filesize').'MB, '. | |
| 149 | +                            'post_max_size: '.(int)(ini_get('post_max_size')).'MB' | |
| 150 | 150 | ); | 
| 151 | 151 | } | 
| 152 | 152 | } | 
| @@ -78,7 +78,7 @@ discard block | ||
| 78 | 78 | $this->addModelToCollection($i, $child); | 
| 79 | 79 | } | 
| 80 | 80 | |
| 81 | -        return $this->sets->values()->map(function (ViewableContract $child) { | |
| 81 | +        return $this->sets->values()->map(function(ViewableContract $child) { | |
| 82 | 82 | return ($this->withSnippets && method_exists($child, 'withSnippets')) | 
| 83 | 83 | ? $child->withSnippets()->setViewParent($this->parent)->renderView() | 
| 84 | 84 | : $child->setViewParent($this->parent)->renderView(); | 
| @@ -95,7 +95,7 @@ discard block | ||
| 95 | 95 |      { | 
| 96 | 96 | // Only published pages you fool! | 
| 97 | 97 | // TODO: check for assistant instead of method existence | 
| 98 | -        if (method_exists($model, 'isPublished') && ! $model->isPublished()) { | |
| 98 | +        if (method_exists($model, 'isPublished') && !$model->isPublished()) { | |
| 99 | 99 | return; | 
| 100 | 100 | } | 
| 101 | 101 | |
| @@ -46,7 +46,7 @@ discard block | ||
| 46 | 46 | |
| 47 | 47 | // 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 | 
| 48 | 48 | // if no content value is present. We don't consider the 'content' attribute to be a default as we do for module. | 
| 49 | -        return $this->map(function ($item) { | |
| 49 | +        return $this->map(function($item) { | |
| 50 | 50 | return ($this->viewParent && $item instanceof ViewableContract) | 
| 51 | 51 | ? $item->setViewParent($this->viewParent)->renderView() | 
| 52 | 52 | : ($item->content ?? ''); | 
| @@ -79,7 +79,7 @@ discard block | ||
| 79 | 79 |      { | 
| 80 | 80 |          $currentPage = $currentPage ?? request()->get('page', 1); | 
| 81 | 81 | $path = request()->path(); | 
| 82 | - $items = array_slice($this->all(), ($currentPage - 1) * $perPage); | |
| 82 | + $items = array_slice($this->all(), ($currentPage-1) * $perPage); | |
| 83 | 83 | |
| 84 | 84 | return (new \Illuminate\Pagination\Paginator($items, $perPage, $currentPage))->setPath($path); | 
| 85 | 85 | } | 
| @@ -96,7 +96,7 @@ discard block | ||
| 96 | 96 |      { | 
| 97 | 97 |          $currentPage = $currentPage ?? request()->get('page', 1); | 
| 98 | 98 | $path = request()->path(); | 
| 99 | - $items = array_slice($this->all(), ($currentPage - 1) * $perPage, $perPage); | |
| 99 | + $items = array_slice($this->all(), ($currentPage-1) * $perPage, $perPage); | |
| 100 | 100 | |
| 101 | 101 | return (new \Illuminate\Pagination\LengthAwarePaginator($items, $this->count(), $perPage, $currentPage))->setPath($path); | 
| 102 | 102 | } | 
| @@ -112,12 +112,12 @@ | ||
| 112 | 112 |              $builder->where('locale', $locale); | 
| 113 | 113 | } | 
| 114 | 114 | |
| 115 | -        if (! $includeRedirects) { | |
| 115 | +        if (!$includeRedirects) { | |
| 116 | 116 |              $builder->whereNull('redirect_id'); | 
| 117 | 117 | } | 
| 118 | 118 | |
| 119 | 119 |          if ($ignoredModel) { | 
| 120 | -            $builder->whereNotIn('id', function ($query) use ($ignoredModel) { | |
| 120 | +            $builder->whereNotIn('id', function($query) use ($ignoredModel) { | |
| 121 | 121 |                  $query->select('id') | 
| 122 | 122 |                        ->from('chief_urls') | 
| 123 | 123 |                        ->where('model_type', '=', $ignoredModel->getMorphClass()) | 
| @@ -8,14 +8,14 @@ | ||
| 8 | 8 |  { | 
| 9 | 9 | public static function findByModel(Model $model, string $locale = null): UrlRecord | 
| 10 | 10 |      { | 
| 11 | -        return chiefMemoize('url-records-find-by-model', function ($model, $locale = null) { | |
| 11 | +        return chiefMemoize('url-records-find-by-model', function($model, $locale = null) { | |
| 12 | 12 | return parent::findByModel($model, $locale); | 
| 13 | 13 | }, [$model, $locale]); | 
| 14 | 14 | } | 
| 15 | 15 | |
| 16 | 16 | public static function getByModel(Model $model) | 
| 17 | 17 |      { | 
| 18 | -        return chiefMemoize('url-records-get-by-model', function ($model) { | |
| 18 | +        return chiefMemoize('url-records-get-by-model', function($model) { | |
| 19 | 19 | return parent::getByModel($model); | 
| 20 | 20 | }, [$model]); | 
| 21 | 21 | } | 
| @@ -39,7 +39,7 @@ discard block | ||
| 39 | 39 | private function saveRecord(string $locale, ?string $slug) | 
| 40 | 40 |      { | 
| 41 | 41 | // Existing ones for this locale? | 
| 42 | -        $nonRedirectsWithSameLocale = $this->existingRecords->filter(function ($record) use ($locale) { | |
| 42 | +        $nonRedirectsWithSameLocale = $this->existingRecords->filter(function($record) use ($locale) { | |
| 43 | 43 | return ( | 
| 44 | 44 | $record->locale == $locale && | 
| 45 | 45 | !$record->isRedirect() | 
| @@ -55,14 +55,14 @@ discard block | ||
| 55 | 55 | |
| 56 | 56 | // If slug entry is left empty, all existing records will be deleted | 
| 57 | 57 |          if (!$slug) { | 
| 58 | -            $nonRedirectsWithSameLocale->each(function ($existingRecord) { | |
| 58 | +            $nonRedirectsWithSameLocale->each(function($existingRecord) { | |
| 59 | 59 | $existingRecord->delete(); | 
| 60 | 60 | }); | 
| 61 | 61 |          } elseif ($nonRedirectsWithSameLocale->isEmpty()) { | 
| 62 | 62 | $this->createRecord($locale, $slug); | 
| 63 | -        } else { | |
| 63 | +        }else { | |
| 64 | 64 | // Only replace the existing records that differ from the current passed slugs | 
| 65 | -            $nonRedirectsWithSameLocale->each(function ($existingRecord) use ($slug) { | |
| 65 | +            $nonRedirectsWithSameLocale->each(function($existingRecord) use ($slug) { | |
| 66 | 66 |                  if ($existingRecord->slug != $slug) { | 
| 67 | 67 | $existingRecord->replaceAndRedirect(['slug' => $slug]); | 
| 68 | 68 | } | 
| @@ -87,12 +87,12 @@ discard block | ||
| 87 | 87 | */ | 
| 88 | 88 | private function deleteIdenticalRedirects($existingRecords, $locale, $slug): void | 
| 89 | 89 |      { | 
| 90 | -        $existingRecords->filter(function ($record) use ($locale) { | |
| 90 | +        $existingRecords->filter(function($record) use ($locale) { | |
| 91 | 91 | return ( | 
| 92 | 92 | $record->locale == $locale && | 
| 93 | 93 | $record->isRedirect() | 
| 94 | 94 | ); | 
| 95 | -        })->each(function ($existingRecord) use ($slug) { | |
| 95 | +        })->each(function($existingRecord) use ($slug) { | |
| 96 | 96 |              if ($existingRecord->slug == $slug) { | 
| 97 | 97 | $existingRecord->delete(); | 
| 98 | 98 | } | 
| @@ -106,7 +106,7 @@ discard block | ||
| 106 | 106 | */ | 
| 107 | 107 | private function prependBaseUrlSegment(string $slug, $locale): string | 
| 108 | 108 |      { | 
| 109 | - $slugWithBaseSegment = $this->model->baseUrlSegment($locale) . '/' . $slug; | |
| 109 | + $slugWithBaseSegment = $this->model->baseUrlSegment($locale).'/'.$slug; | |
| 110 | 110 | $slugWithBaseSegment = trim($slugWithBaseSegment, '/'); | 
| 111 | 111 | |
| 112 | 112 | // If slug with base segment is empty string, it means that the passed slug was probably a "/" character. | 
| @@ -42,10 +42,10 @@ discard block | ||
| 42 | 42 | $fields = new static([]); | 
| 43 | 43 | |
| 44 | 44 |          foreach ($locales as $locale) { | 
| 45 | -            $fields['url-slugs.' . $locale] = UrlSlugField::make('url-slugs.' . $locale) | |
| 45 | +            $fields['url-slugs.'.$locale] = UrlSlugField::make('url-slugs.'.$locale) | |
| 46 | 46 | ->setBaseUrlSegment($model->baseUrlSegment($locale)) | 
| 47 | - ->prepend($model->resolveUrl($locale, $model->baseUrlSegment($locale)) .'/') | |
| 48 | -                                                ->name('url-slugs[' . $locale . ']') | |
| 47 | + ->prepend($model->resolveUrl($locale, $model->baseUrlSegment($locale)).'/') | |
| 48 | +                                                ->name('url-slugs['.$locale.']') | |
| 49 | 49 | ->label($locale); | 
| 50 | 50 | } | 
| 51 | 51 | |
| @@ -58,7 +58,7 @@ discard block | ||
| 58 | 58 | */ | 
| 59 | 59 | private static function fillWithExistingValues(ProvidesUrl $model, self $fields): void | 
| 60 | 60 |      { | 
| 61 | -        $records = MemoizedUrlRecord::getByModel($model)->reject(function ($record) { | |
| 61 | +        $records = MemoizedUrlRecord::getByModel($model)->reject(function($record) { | |
| 62 | 62 | return $record->isRedirect(); | 
| 63 | 63 |          })->sortBy('locale'); | 
| 64 | 64 | |
| @@ -70,7 +70,7 @@ discard block | ||
| 70 | 70 | $fields['url-slugs.'.$record->locale] | 
| 71 | 71 | ->setUrlRecord($record) | 
| 72 | 72 | ->setBaseUrlSegment($model->baseUrlSegment($record->locale)) | 
| 73 | - ->prepend($model->resolveUrl($record->locale, $model->baseUrlSegment($record->locale)) .'/'); | |
| 73 | + ->prepend($model->resolveUrl($record->locale, $model->baseUrlSegment($record->locale)).'/'); | |
| 74 | 74 | } | 
| 75 | 75 | } | 
| 76 | 76 | } | 
| @@ -39,11 +39,11 @@ discard block | ||
| 39 | 39 | return static::createRedirect($model->url($locale)); | 
| 40 | 40 | } | 
| 41 | 41 | |
| 42 | -            if (method_exists($model, 'isPublished') && ! $model->isPublished()) { | |
| 42 | +            if (method_exists($model, 'isPublished') && !$model->isPublished()) { | |
| 43 | 43 | |
| 44 | 44 | /** When admin is logged in and this request is in preview mode, we allow the view */ | 
| 45 | -                if (! PreviewMode::fromRequest()->check()) { | |
| 46 | -                    throw new NotFoundHttpException('Model found for request ['. $slug .'] but it is not published.'); | |
| 45 | +                if (!PreviewMode::fromRequest()->check()) { | |
| 46 | +                    throw new NotFoundHttpException('Model found for request ['.$slug.'] but it is not published.'); | |
| 47 | 47 | } | 
| 48 | 48 | } | 
| 49 | 49 | |
| @@ -54,7 +54,7 @@ discard block | ||
| 54 | 54 | } | 
| 55 | 55 | } | 
| 56 | 56 | |
| 57 | -        throw new NotFoundHttpException('No url or model found for request ['. $slug .'] for locale ['.$locale.'].'); | |
| 57 | +        throw new NotFoundHttpException('No url or model found for request ['.$slug.'] for locale ['.$locale.'].'); | |
| 58 | 58 | } | 
| 59 | 59 | |
| 60 | 60 | private static function createRedirect(string $url) | 
| @@ -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 | |
| @@ -142,7 +142,7 @@ discard block | ||
| 142 | 142 | } | 
| 143 | 143 | |
| 144 | 144 |          if (!in_array($name, ['label', 'key', 'description', 'column', 'name', 'prepend', 'append'])) { | 
| 145 | -            throw new \InvalidArgumentException('Cannot set value by ['. $name .'].'); | |
| 145 | +            throw new \InvalidArgumentException('Cannot set value by ['.$name.'].'); | |
| 146 | 146 | } | 
| 147 | 147 | |
| 148 | 148 | $this->values[$name] = $arguments[0]; |