@@ -39,11 +39,11 @@ |
||
39 | 39 | |
40 | 40 | public static function notAllowedVerb($verb, Manager $manager) |
41 | 41 | { |
42 | - throw new self('Not allowed to ' . $verb . ' a model. ' . ucfirst($verb) . ' route is not allowed by the ' . $manager->details()->key . ' manager.'); |
|
42 | + throw new self('Not allowed to '.$verb.' a model. '.ucfirst($verb).' route is not allowed by the '.$manager->details()->key.' manager.'); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | public static function notAllowedPermission($permission, Manager $manager) |
46 | 46 | { |
47 | - throw new self('Not allowed permission for ' . $permission . ' on a model as managed by the ' . $manager->details()->key . ' manager.'); |
|
47 | + throw new self('Not allowed permission for '.$permission.' on a model as managed by the '.$manager->details()->key.' manager.'); |
|
48 | 48 | } |
49 | 49 | } |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | $genericModelInstance = $this->modelInstance(); |
17 | 17 | |
18 | 18 | // Generic model details |
19 | - $id = Str::slug($this->registration->key() . ($this->hasExistingModel() ? '-' . $this->existingModel()->id : '')); |
|
19 | + $id = Str::slug($this->registration->key().($this->hasExistingModel() ? '-'.$this->existingModel()->id : '')); |
|
20 | 20 | $key = $this->registration->key(); |
21 | 21 | $labelSingular = property_exists($genericModelInstance, 'labelSingular') ? $genericModelInstance->labelSingular : Str::singular($key); |
22 | 22 | $labelPlural = property_exists($genericModelInstance, 'labelPlural') ? $genericModelInstance->labelPlural : Str::plural($key); |
@@ -32,10 +32,10 @@ discard block |
||
32 | 32 | return new Details( |
33 | 33 | $id, |
34 | 34 | $key, |
35 | - $labelSingular . '', |
|
36 | - $labelPlural . '', |
|
35 | + $labelSingular.'', |
|
36 | + $labelPlural.'', |
|
37 | 37 | $internal_label, |
38 | - $title . '' |
|
38 | + $title.'' |
|
39 | 39 | ); |
40 | 40 | } |
41 | 41 | } |
@@ -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(), |
@@ -119,12 +119,12 @@ 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 | } |
126 | 126 | |
127 | - return '<li>' . $output . '</li>'; |
|
127 | + return '<li>'.$output.'</li>'; |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |
@@ -146,19 +146,19 @@ 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>'; |
160 | 160 | $output .= '</dropdown>'; |
161 | 161 | |
162 | - return '<li>' . $output . '</li>'; |
|
162 | + return '<li>'.$output.'</li>'; |
|
163 | 163 | } |
164 | 164 | } |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | ->first(); |
37 | 37 | |
38 | 38 | if (!$record) { |
39 | - throw new UrlRecordNotFound('No url record found for model [' . $model->getMorphClass() . '@' . $model->id . '] for locale [' . $locale . '].'); |
|
39 | + throw new UrlRecordNotFound('No url record found for model ['.$model->getMorphClass().'@'.$model->id.'] for locale ['.$locale.'].'); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | return $record; |
@@ -44,7 +44,7 @@ discard block |
||
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 | } |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | $targetModel = Morphables::instance($targetUrlRecord->model_type)->find($targetUrlRecord->model_id); |
38 | 38 | |
39 | 39 | if (!$targetModel) { |
40 | - throw new \DomainException('Corrupt target model for this url request. Model by reference [' . $targetUrlRecord->model_type . '@' . $targetUrlRecord->model_id . '] has probably been archived or deleted.'); |
|
40 | + throw new \DomainException('Corrupt target model for this url request. Model by reference ['.$targetUrlRecord->model_type.'@'.$targetUrlRecord->model_id.'] has probably been archived or deleted.'); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | return static::createRedirect($targetModel->url($locale)); |
@@ -47,14 +47,14 @@ discard block |
||
47 | 47 | } |
48 | 48 | |
49 | 49 | if (!$model) { |
50 | - 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.'); |
|
50 | + 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.'); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | if (method_exists($model, 'isPublished') && !$model->isPublished()) { |
54 | 54 | |
55 | 55 | /** When admin is logged in and this request is in preview mode, we allow the view */ |
56 | 56 | if (!PreviewMode::fromRequest()->check()) { |
57 | - throw new NotFoundHttpException('Model found for request [' . $slug . '] but it is not published.'); |
|
57 | + throw new NotFoundHttpException('Model found for request ['.$slug.'] but it is not published.'); |
|
58 | 58 | } |
59 | 59 | } |
60 | 60 | |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | } |
66 | 66 | } |
67 | 67 | |
68 | - throw new NotFoundHttpException('No url or model found for request [' . $slug . '] for locale [' . $locale . '].'); |
|
68 | + throw new NotFoundHttpException('No url or model found for request ['.$slug.'] for locale ['.$locale.'].'); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | private static function createRedirect(string $url) |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | { |
43 | 43 | return $this->fullUrl |
44 | 44 | ? $this->fullUrl |
45 | - : $this->prepend . $this->getValue(); |
|
45 | + : $this->prepend.$this->getValue(); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | public function setFullUrl(string $fullUrl) |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | 'baseUrlSegment' => $this->baseUrlSegment, |
95 | 95 | 'hint' => null, // Hint placeholder to show url hint when it already exists |
96 | 96 | 'is_homepage' => ($this->getValue() === '/'), |
97 | - 'show' => !!$this->getValue(),// show input field or not |
|
97 | + 'show' => !!$this->getValue(), // show input field or not |
|
98 | 98 | ]; |
99 | 99 | } |
100 | 100 | } |
@@ -60,6 +60,6 @@ |
||
60 | 60 | */ |
61 | 61 | public function message() |
62 | 62 | { |
63 | - return 'De \'' . $this->failedDetails['slug'] . '\' link wordt in het ' . $this->failedDetails['locale'] . ' al door een andere pagina gebruikt.'; |
|
63 | + return 'De \''.$this->failedDetails['slug'].'\' link wordt in het '.$this->failedDetails['locale'].' al door een andere pagina gebruikt.'; |
|
64 | 64 | } |
65 | 65 | } |
@@ -18,14 +18,14 @@ 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 | |
25 | 25 | $fields = new static([]); |
26 | 26 | |
27 | 27 | foreach ($records as $record) { |
28 | - $key = 'redirects-' . $record->locale . '-' . $record->slug; |
|
28 | + $key = 'redirects-'.$record->locale.'-'.$record->slug; |
|
29 | 29 | $fields[$key] = UrlSlugField::make($key) |
30 | 30 | ->setUrlRecord($record) |
31 | 31 | ->setFullUrl($model->resolveUrl($record->locale, $record->slug)); |
@@ -60,10 +60,10 @@ discard block |
||
60 | 60 | $fields = new static([]); |
61 | 61 | |
62 | 62 | foreach ($locales as $locale) { |
63 | - $fields['url-slugs.' . $locale] = UrlSlugField::make('url-slugs.' . $locale) |
|
63 | + $fields['url-slugs.'.$locale] = UrlSlugField::make('url-slugs.'.$locale) |
|
64 | 64 | ->setBaseUrlSegment($model->baseUrlSegment($locale)) |
65 | - ->prepend($model->resolveUrl($locale, $model->baseUrlSegment($locale)) . '/') |
|
66 | - ->name('url-slugs[' . $locale . ']') |
|
65 | + ->prepend($model->resolveUrl($locale, $model->baseUrlSegment($locale)).'/') |
|
66 | + ->name('url-slugs['.$locale.']') |
|
67 | 67 | ->label($locale); |
68 | 68 | } |
69 | 69 | |
@@ -76,19 +76,19 @@ discard block |
||
76 | 76 | */ |
77 | 77 | private static function fillWithExistingValues(ProvidesUrl $model, self $fields): void |
78 | 78 | { |
79 | - $records = UrlRecord::getByModel($model)->reject(function ($record) { |
|
79 | + $records = UrlRecord::getByModel($model)->reject(function($record) { |
|
80 | 80 | return $record->isRedirect(); |
81 | 81 | })->sortBy('locale'); |
82 | 82 | |
83 | 83 | foreach ($records as $record) { |
84 | - if (!isset($fields['url-slugs.' . $record->locale])) { |
|
84 | + if (!isset($fields['url-slugs.'.$record->locale])) { |
|
85 | 85 | continue; |
86 | 86 | } |
87 | 87 | |
88 | - $fields['url-slugs.' . $record->locale] |
|
88 | + $fields['url-slugs.'.$record->locale] |
|
89 | 89 | ->setUrlRecord($record) |
90 | 90 | ->setBaseUrlSegment($model->baseUrlSegment($record->locale)) |
91 | - ->prepend($model->resolveUrl($record->locale, $model->baseUrlSegment($record->locale)) . '/'); |
|
91 | + ->prepend($model->resolveUrl($record->locale, $model->baseUrlSegment($record->locale)).'/'); |
|
92 | 92 | } |
93 | 93 | } |
94 | 94 | } |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | ->orderBy('sort', 'ASC') |
53 | 53 | ->get(); |
54 | 54 | |
55 | - return $relations->map(function (Relation $relation) { |
|
55 | + return $relations->map(function(Relation $relation) { |
|
56 | 56 | $parent = $relation->parent; |
57 | 57 | $parent->relation = $relation; |
58 | 58 | |
@@ -67,14 +67,14 @@ discard block |
||
67 | 67 | ->orderBy('sort', 'ASC') |
68 | 68 | ->get(); |
69 | 69 | |
70 | - return $relations->map(function (Relation $relation) use ($parent_type, $parent_id) { |
|
70 | + return $relations->map(function(Relation $relation) use ($parent_type, $parent_id) { |
|
71 | 71 | |
72 | 72 | // It could be that the child itself is soft-deleted, if this is the case, we will ignore it and move on. |
73 | 73 | if (!$child = $relation->child) { |
74 | 74 | if (!$relation->child()->withTrashed()->first()) { |
75 | 75 | // if ((!method_exists($childInstance, 'trashed')) || ! $childInstance->onlyTrashed()->find($relation->child_id)) { |
76 | 76 | // If we cannot retrieve it then he collection type is possibly off, this is a database inconsistency and should be addressed |
77 | - throw new \DomainException('Corrupt relation reference. Related child [' . $relation->child_type . '@' . $relation->child_id . '] could not be retrieved for parent [' . $parent_type . '@' . $parent_id . ']. Make sure the morph key can resolve to a valid class.'); |
|
77 | + throw new \DomainException('Corrupt relation reference. Related child ['.$relation->child_type.'@'.$relation->child_id.'] could not be retrieved for parent ['.$parent_type.'@'.$parent_id.']. Make sure the morph key can resolve to a valid class.'); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | return null; |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | }) |
87 | 87 | |
88 | 88 | // In case of soft-deleted entries, this will be null and should be ignored. We make sure that keys are reset in case of removed child |
89 | - ->reject(function ($child) { |
|
89 | + ->reject(function($child) { |
|
90 | 90 | return is_null($child); |
91 | 91 | }) |
92 | 92 | ->values(); |
@@ -103,10 +103,10 @@ discard block |
||
103 | 103 | |
104 | 104 | public static function deleteRelationsOf($type, $id) |
105 | 105 | { |
106 | - $relations = static::where(function ($query) use ($type, $id) { |
|
106 | + $relations = static::where(function($query) use ($type, $id) { |
|
107 | 107 | return $query->where('parent_type', $type) |
108 | 108 | ->where('parent_id', $id); |
109 | - })->orWhere(function ($query) use ($type, $id) { |
|
109 | + })->orWhere(function($query) use ($type, $id) { |
|
110 | 110 | return $query->where('child_type', $type) |
111 | 111 | ->where('child_id', $id); |
112 | 112 | })->get(); |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | |
119 | 119 | public static function deleteAllChildRelationsOf($type, $id) |
120 | 120 | { |
121 | - $relations = static::where(function ($query) use ($type, $id) { |
|
121 | + $relations = static::where(function($query) use ($type, $id) { |
|
122 | 122 | return $query->where('parent_type', $type) |
123 | 123 | ->where('parent_id', $id); |
124 | 124 | })->get(); |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | |
131 | 131 | public static function deleteAllParentRelationsOf($type, $id) |
132 | 132 | { |
133 | - $relations = static::where(function ($query) use ($type, $id) { |
|
133 | + $relations = static::where(function($query) use ($type, $id) { |
|
134 | 134 | return $query->where('child_type', $type) |
135 | 135 | ->where('child_id', $id); |
136 | 136 | })->get(); |