@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | |
37 | 37 | // If no view has been created for this model, we try once again to fetch the content value if any. This will silently fail |
38 | 38 | // if no content value is present. We consider the 'content' attribute to be a default for our copy. |
39 | - return isset($this->content) ? (string) $this->content : ''; |
|
39 | + return isset($this->content) ? (string)$this->content : ''; |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | public function setViewParent(ActsAsParent $parent): ViewableContract |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | } |
65 | 65 | |
66 | 66 | if (config('thinktomorrow.chief.strict')) { |
67 | - throw new NotFoundViewKey('Missing view key. Please add a [viewKey] property to ' . get_class($this)); |
|
67 | + throw new NotFoundViewKey('Missing view key. Please add a [viewKey] property to '.get_class($this)); |
|
68 | 68 | }; |
69 | 69 | |
70 | 70 | return ''; |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | |
27 | 27 | // Media fields are treated separately |
28 | 28 | if ($field->ofType(FieldType::MEDIA, FieldType::DOCUMENT)) { |
29 | - if (! isset($this->saveMethods['_files'])) { |
|
29 | + if (!isset($this->saveMethods['_files'])) { |
|
30 | 30 | $this->saveMethods['_files'] = ['field' => new Fields([$field]), 'method' => 'uploadMedia']; |
31 | 31 | continue; |
32 | 32 | } |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | } |
37 | 37 | |
38 | 38 | // Custom set methods - default is the generic setField() method. |
39 | - $methodName = 'set'. ucfirst(camel_case($field->key())) . 'Field'; |
|
39 | + $methodName = 'set'.ucfirst(camel_case($field->key())).'Field'; |
|
40 | 40 | (method_exists($manager, $methodName)) |
41 | 41 | ? $manager->$methodName($field, $request) |
42 | 42 | : $manager->setField($field, $request); |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | |
49 | 49 | protected function detectCustomSaveMethods(Manager $manager, Field $field): bool |
50 | 50 | { |
51 | - $saveMethodName = 'save'. ucfirst(camel_case($field->key())) . 'Field'; |
|
51 | + $saveMethodName = 'save'.ucfirst(camel_case($field->key())).'Field'; |
|
52 | 52 | |
53 | 53 | // Custom save method on assistant |
54 | 54 | foreach ($manager->assistants() as $assistant) { |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | */ |
18 | 18 | public function isAssistedBy(string $assistant): bool |
19 | 19 | { |
20 | - return !! $this->getAssistantClass($assistant); |
|
20 | + return !!$this->getAssistantClass($assistant); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | public function assistants(): array |
@@ -40,8 +40,8 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public function assistant(string $assistant): Assistant |
42 | 42 | { |
43 | - if (! $this->isAssistedBy($assistant)) { |
|
44 | - throw new MissingAssistant('No assistant [' . $assistant . '] present on manager ' . get_class($this)); |
|
43 | + if (!$this->isAssistedBy($assistant)) { |
|
44 | + throw new MissingAssistant('No assistant ['.$assistant.'] present on manager '.get_class($this)); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | $instance = app($this->getAssistantClass($assistant)); |
@@ -23,10 +23,10 @@ discard block |
||
23 | 23 | |
24 | 24 | public function manager(Manager $manager) |
25 | 25 | { |
26 | - $this->manager = $manager; |
|
26 | + $this->manager = $manager; |
|
27 | 27 | |
28 | - if (! $manager->model() instanceof ProvidesUrl) { |
|
29 | - throw new \Exception('UrlAssistant requires the model interfaced by ' . ProvidesUrl::class . '.'); |
|
28 | + if (!$manager->model() instanceof ProvidesUrl) { |
|
29 | + throw new \Exception('UrlAssistant requires the model interfaced by '.ProvidesUrl::class.'.'); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | $this->model = $manager->model(); |
@@ -54,14 +54,14 @@ discard block |
||
54 | 54 | InputField::make('url-slugs') |
55 | 55 | ->validation( |
56 | 56 | [ |
57 | - 'url-slugs' => ['array', 'min:1', new UniqueUrlSlugRule(($this->model && $this->model->exists) ? $this->model : null),], |
|
57 | + 'url-slugs' => ['array', 'min:1', new UniqueUrlSlugRule(($this->model && $this->model->exists) ? $this->model : null), ], |
|
58 | 58 | ], |
59 | 59 | [], |
60 | 60 | [ |
61 | 61 | 'url-slugs.*' => 'taalspecifieke link', |
62 | 62 | ]) |
63 | 63 | ->view('chief::back._fields.url-slugs') |
64 | - ->viewData(['fields' => UrlSlugFields::fromModel($this->model) ]), |
|
64 | + ->viewData(['fields' => UrlSlugFields::fromModel($this->model)]), |
|
65 | 65 | ]); |
66 | 66 | } |
67 | 67 |
@@ -72,11 +72,11 @@ discard block |
||
72 | 72 | $this->filters()->apply($builder); |
73 | 73 | |
74 | 74 | $results = $builder->get(); |
75 | - } else { |
|
75 | + }else { |
|
76 | 76 | $results = $model::all(); |
77 | 77 | } |
78 | 78 | |
79 | - return $results->map(function ($model) { |
|
79 | + return $results->map(function($model) { |
|
80 | 80 | return (new static($this->registration))->manage($model); |
81 | 81 | }); |
82 | 82 | } |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | |
145 | 145 | public function guard($verb): Manager |
146 | 146 | { |
147 | - if (! $this->can($verb)) { |
|
147 | + if (!$this->can($verb)) { |
|
148 | 148 | NotAllowedManagerRoute::notAllowedVerb($verb, $this); |
149 | 149 | } |
150 | 150 | |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | $fields = $this->fields(); |
168 | 168 | |
169 | 169 | foreach ($this->assistants() as $assistant) { |
170 | - if (! method_exists($assistant, 'fields')) { |
|
170 | + if (!method_exists($assistant, 'fields')) { |
|
171 | 171 | continue; |
172 | 172 | } |
173 | 173 | |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | |
207 | 207 | // Could be translatable field |
208 | 208 | if ($this->isTranslatableKey($field)) { |
209 | - $attribute = substr($field, strrpos($field, '.') + 1); |
|
209 | + $attribute = substr($field, strrpos($field, '.')+1); |
|
210 | 210 | $locale = substr($field, strlen('trans.'), 2); |
211 | 211 | |
212 | 212 | return $this->model->getTranslationFor($attribute, $locale); |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | |
245 | 245 | // Make our media fields able to be translatable as well... |
246 | 246 | if ($field->ofType(FieldType::MEDIA, FieldType::DOCUMENT)) { |
247 | - throw new \Exception('Cannot process the ' . $field->key . ' media field. Currently no support for translatable media files. We should fix this!'); |
|
247 | + throw new \Exception('Cannot process the '.$field->key.' media field. Currently no support for translatable media files. We should fix this!'); |
|
248 | 248 | } |
249 | 249 | |
250 | 250 | // Okay so this is a bit odd but since all translations are expected to be inside the trans |
@@ -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 .= $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>'; |
@@ -6,14 +6,14 @@ |
||
6 | 6 | { |
7 | 7 | public function run() |
8 | 8 | { |
9 | - foreach ($this->tasks() as $task){ |
|
9 | + foreach ($this->tasks() as $task) { |
|
10 | 10 | $this->runTask($task); |
11 | 11 | } |
12 | 12 | } |
13 | 13 | |
14 | 14 | private function runTask(Task $task) |
15 | 15 | { |
16 | - if($task->check()) return; |
|
16 | + if ($task->check()) return; |
|
17 | 17 | |
18 | 18 | $task->run(); |
19 | 19 | } |
@@ -13,7 +13,9 @@ |
||
13 | 13 | |
14 | 14 | private function runTask(Task $task) |
15 | 15 | { |
16 | - if($task->check()) return; |
|
16 | + if($task->check()) { |
|
17 | + return; |
|
18 | + } |
|
17 | 19 | |
18 | 20 | $task->run(); |
19 | 21 | } |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | // Generate all permissions if only scope is passed |
43 | 43 | if (false === strpos($permissionName, '-')) { |
44 | 44 | $cleanPermissionNames = array_merge($cleanPermissionNames, Permission::generate($permissionName)); |
45 | - } else { |
|
45 | + }else { |
|
46 | 46 | // Trim the value |
47 | 47 | $cleanPermissionNames[] = $permissionName; |
48 | 48 | } |
@@ -55,6 +55,6 @@ discard block |
||
55 | 55 | $role->givePermissionTo($cleanPermissionName); |
56 | 56 | } |
57 | 57 | |
58 | - $this->info('Role ' . $role->name . ' was assigned the permissions: ' . implode(',', $cleanPermissionNames)); |
|
58 | + $this->info('Role '.$role->name.' was assigned the permissions: '.implode(',', $cleanPermissionNames)); |
|
59 | 59 | } |
60 | 60 | } |
@@ -33,22 +33,22 @@ |
||
33 | 33 | |
34 | 34 | if ($this->option('dev')) { |
35 | 35 | $role = 'developer'; |
36 | - } else { |
|
36 | + }else { |
|
37 | 37 | $role = 'admin'; |
38 | 38 | } |
39 | 39 | |
40 | 40 | $this->createUser($firstname, $lastname, $email, $password, [$role]); |
41 | 41 | |
42 | - $this->info($firstname.' '.$lastname. ' succesfully added as admin user.'); |
|
42 | + $this->info($firstname.' '.$lastname.' succesfully added as admin user.'); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | private function settingPermissionsAndRoles() |
46 | 46 | { |
47 | - AuthorizationDefaults::permissions()->each(function ($permissionName) { |
|
47 | + AuthorizationDefaults::permissions()->each(function($permissionName) { |
|
48 | 48 | Artisan::call('chief:permission', ['name' => $permissionName]); |
49 | 49 | }); |
50 | 50 | |
51 | - AuthorizationDefaults::roles()->each(function ($defaultPermissions, $roleName) { |
|
51 | + AuthorizationDefaults::roles()->each(function($defaultPermissions, $roleName) { |
|
52 | 52 | Artisan::call('chief:role', ['name' => $roleName, '--permissions' => implode(',', $defaultPermissions)]); |
53 | 53 | }); |
54 | 54 |