@@ -79,7 +79,7 @@ |
||
79 | 79 | return $value; |
80 | 80 | } |
81 | 81 | |
82 | - $value = str_replace('.', '][', $value) . ']'; |
|
82 | + $value = str_replace('.', '][', $value).']'; |
|
83 | 83 | |
84 | 84 | return substr_replace($value, '', strpos($value, ']'), 1); |
85 | 85 | } |
@@ -56,7 +56,7 @@ |
||
56 | 56 | protected function validateAssetMimetypes(Asset $asset, $parameters) |
57 | 57 | { |
58 | 58 | return (in_array($asset->getMimeType(), $parameters) || |
59 | - in_array(explode('/', $asset->getMimeType())[0] . '/*', $parameters)); |
|
59 | + in_array(explode('/', $asset->getMimeType())[0].'/*', $parameters)); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | protected function validateAssetMax(Asset $asset, $parameters) |
@@ -39,7 +39,7 @@ |
||
39 | 39 | |
40 | 40 | public function get(): string |
41 | 41 | { |
42 | - return $this->className . '@' . $this->id; |
|
42 | + return $this->className.'@'.$this->id; |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | public function equals($other): bool |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | public static function fromString(string $reference): FlatReference |
8 | 8 | { |
9 | 9 | if (false == strpos($reference, '@')) { |
10 | - throw new \InvalidArgumentException('Invalid reference composition. A flat reference should honour schema <class>@<id>. [' . $reference . '] was passed instead.'); |
|
10 | + throw new \InvalidArgumentException('Invalid reference composition. A flat reference should honour schema <class>@<id>. ['.$reference.'] was passed instead.'); |
|
11 | 11 | } |
12 | 12 | |
13 | 13 | list($className, $id) = explode('@', $reference); |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | $instance->{$instance->getKeyName()} = $id; |
17 | 17 | |
18 | 18 | if (!method_exists($instance, 'flatReference')) { |
19 | - throw new \InvalidArgumentException('Instance created from model reference [' . $reference . '] was expected to have a method of flatReference() but is has not.'); |
|
19 | + throw new \InvalidArgumentException('Instance created from model reference ['.$reference.'] was expected to have a method of flatReference() but is has not.'); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | return $instance->flatReference(); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | |
50 | 50 | // 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 |
51 | 51 | // if no content value is present. We don't consider the 'content' attribute to be a default as we do for module. |
52 | - return $this->map(function ($item) { |
|
52 | + return $this->map(function($item) { |
|
53 | 53 | return ($this->viewParent && $item instanceof ViewableContract) |
54 | 54 | ? $item->setViewParent($this->viewParent)->renderView() |
55 | 55 | : ($item->content ?? ''); |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | { |
83 | 83 | $currentPage = $currentPage ?? request()->get('page', 1); |
84 | 84 | $path = request()->path(); |
85 | - $items = array_slice($this->all(), ($currentPage - 1) * $perPage); |
|
85 | + $items = array_slice($this->all(), ($currentPage-1) * $perPage); |
|
86 | 86 | |
87 | 87 | return (new \Illuminate\Pagination\Paginator($items, $perPage ?? $this->paginateSetting('perPage', '12'), $currentPage))->setPath($path); |
88 | 88 | } |
@@ -98,8 +98,8 @@ discard block |
||
98 | 98 | public function paginate($perPage = null, $currentPage = null): Paginator |
99 | 99 | { |
100 | 100 | $currentPage = $currentPage ?? request()->get('page', 1); |
101 | - $path = '/' . request()->path(); |
|
102 | - $items = array_slice($this->all(), ($currentPage - 1) * $perPage, $perPage); |
|
101 | + $path = '/'.request()->path(); |
|
102 | + $items = array_slice($this->all(), ($currentPage-1) * $perPage, $perPage); |
|
103 | 103 | |
104 | 104 | return (new \Illuminate\Pagination\LengthAwarePaginator($items, $this->paginateSetting('total', $this->count()), $perPage ?? $this->paginateSetting('perPage', '12'), $currentPage))->setPath($path); |
105 | 105 | } |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | { |
37 | 37 | // Constraints |
38 | 38 | if (!isset($values['action'])) { |
39 | - throw new \InvalidArgumentException('Set reference array is missing required values for the "action" keys. Given: ' . print_r($values, true)); |
|
39 | + throw new \InvalidArgumentException('Set reference array is missing required values for the "action" keys. Given: '.print_r($values, true)); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | return new static( |
@@ -51,14 +51,14 @@ discard block |
||
51 | 51 | { |
52 | 52 | $sets = config('thinktomorrow.chief.sets', []); |
53 | 53 | |
54 | - return collect($sets)->map(function ($set, $key) { |
|
54 | + return collect($sets)->map(function($set, $key) { |
|
55 | 55 | return SetReference::fromArray($key, $set); |
56 | 56 | }); |
57 | 57 | } |
58 | 58 | |
59 | 59 | public static function find($key): ?SetReference |
60 | 60 | { |
61 | - return static::all()->filter(function ($ref) use ($key) { |
|
61 | + return static::all()->filter(function($ref) use ($key) { |
|
62 | 62 | return $ref->key() == $key; |
63 | 63 | })->first(); |
64 | 64 | } |
@@ -150,11 +150,11 @@ discard block |
||
150 | 150 | private static function validateAction($class, $method) |
151 | 151 | { |
152 | 152 | if (!class_exists($class)) { |
153 | - throw new \InvalidArgumentException('The class [' . $class . '] isn\'t a valid class reference or does not exist in the chief-settings.sets config entry.'); |
|
153 | + throw new \InvalidArgumentException('The class ['.$class.'] isn\'t a valid class reference or does not exist in the chief-settings.sets config entry.'); |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | if (!method_exists($class, $method)) { |
157 | - throw new \InvalidArgumentException('The method [' . $method . '] does not exist on the class [' . $class . ']. Make sure you provide a valid method to the action value in the chief-settings.sets config entry.'); |
|
157 | + throw new \InvalidArgumentException('The method ['.$method.'] does not exist on the class ['.$class.']. Make sure you provide a valid method to the action value in the chief-settings.sets config entry.'); |
|
158 | 158 | } |
159 | 159 | } |
160 | 160 |
@@ -35,12 +35,12 @@ |
||
35 | 35 | |
36 | 36 | public function toReference(): SetReference |
37 | 37 | { |
38 | - $reference = SetReference::all()->first(function ($setReference) { |
|
38 | + $reference = SetReference::all()->first(function($setReference) { |
|
39 | 39 | return $setReference->key() == $this->key; |
40 | 40 | }); |
41 | 41 | |
42 | 42 | if (!$reference) { |
43 | - throw new \Exception('No query set found by key [' . $this->key . ']. Make sure that this ' . $this->key . ' set is added to the chief.sets config array.'); |
|
43 | + throw new \Exception('No query set found by key ['.$this->key.']. Make sure that this '.$this->key.' set is added to the chief.sets config array.'); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | return $reference; |
@@ -26,15 +26,15 @@ |
||
26 | 26 | { |
27 | 27 | $abilities = ['view', 'create', 'update', 'delete']; |
28 | 28 | |
29 | - return array_map(function ($val) use ($scope) { |
|
30 | - return $val . '-' . $scope; |
|
29 | + return array_map(function($val) use ($scope) { |
|
30 | + return $val.'-'.$scope; |
|
31 | 31 | }, $abilities); |
32 | 32 | } |
33 | 33 | |
34 | 34 | public static function getPermissionsForIndex() |
35 | 35 | { |
36 | 36 | $permissions = $temp = []; |
37 | - self::all()->each(function ($permission) use (&$permissions, &$temp) { |
|
37 | + self::all()->each(function($permission) use (&$permissions, &$temp) { |
|
38 | 38 | $model = explode("_", $permission->name, 2)[1]; |
39 | 39 | $temp[$model][$permission->id] = explode("_", $permission->name, 2)[0]; |
40 | 40 | $permissions = $temp; |
@@ -37,10 +37,10 @@ discard block |
||
37 | 37 | |
38 | 38 | // Set required paths |
39 | 39 | $this->dirs = ['base' => $this->settings['base_path'] ?? base_path()]; |
40 | - $this->dirs['model'] = $this->settings['model_path'] ?? $this->dirs['base'] . '/' . config('thinktomorrow.chief.domain.path', 'src'); |
|
41 | - $this->dirs['views'] = $this->settings['views_path'] ?? $this->dirs['base'] . '/resources/views'; |
|
42 | - $this->dirs['controller'] = $this->settings['controller_path'] ?? $this->dirs['base'] . '/app/Http/Controllers'; |
|
43 | - $this->files['routes'] = $this->settings['routes_file'] ?? $this->dirs['base'] . '/routes/web.php'; |
|
40 | + $this->dirs['model'] = $this->settings['model_path'] ?? $this->dirs['base'].'/'.config('thinktomorrow.chief.domain.path', 'src'); |
|
41 | + $this->dirs['views'] = $this->settings['views_path'] ?? $this->dirs['base'].'/resources/views'; |
|
42 | + $this->dirs['controller'] = $this->settings['controller_path'] ?? $this->dirs['base'].'/app/Http/Controllers'; |
|
43 | + $this->files['routes'] = $this->settings['routes_file'] ?? $this->dirs['base'].'/routes/web.php'; |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | public function handle() |
@@ -62,19 +62,19 @@ discard block |
||
62 | 62 | private function publishModel() |
63 | 63 | { |
64 | 64 | $this->publishFile( |
65 | - __DIR__ . '/stubs/model.php.stub', |
|
66 | - $to = $this->dirs['model'] . '/' . ucfirst($this->plural) . '/' . ucfirst($this->singular) . '.php', |
|
65 | + __DIR__.'/stubs/model.php.stub', |
|
66 | + $to = $this->dirs['model'].'/'.ucfirst($this->plural).'/'.ucfirst($this->singular).'.php', |
|
67 | 67 | 'model' |
68 | 68 | ); |
69 | 69 | |
70 | - $this->addToConfig('collections', [$this->plural => $this->guessNamespace() . '\\' . ucfirst($this->singular)]); |
|
70 | + $this->addToConfig('collections', [$this->plural => $this->guessNamespace().'\\'.ucfirst($this->singular)]); |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | private function publishController() |
74 | 74 | { |
75 | 75 | $this->publishFile( |
76 | - __DIR__ . '/stubs/controller.php.stub', |
|
77 | - $to = $this->dirs['controller'] . '/' . ucfirst($this->plural) . '/' . ucfirst($this->singular) . '.php', |
|
76 | + __DIR__.'/stubs/controller.php.stub', |
|
77 | + $to = $this->dirs['controller'].'/'.ucfirst($this->plural).'/'.ucfirst($this->singular).'.php', |
|
78 | 78 | 'controller' |
79 | 79 | ); |
80 | 80 | } |
@@ -113,8 +113,8 @@ discard block |
||
113 | 113 | private function modelTraits() |
114 | 114 | { |
115 | 115 | return [ |
116 | - '\\' . Publishable::class, |
|
117 | - '\\' . Sortable::class, |
|
116 | + '\\'.Publishable::class, |
|
117 | + '\\'.Sortable::class, |
|
118 | 118 | 'q' => 'Proceed.', |
119 | 119 | ]; |
120 | 120 | } |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | protected function publishFile($from, $to, $type) |
130 | 130 | { |
131 | 131 | if ($this->filesystem->exists($to) && !$this->option('force')) { |
132 | - if (!$this->confirm('File [' . $to . '] already exists? Overwrite this file?')) { |
|
132 | + if (!$this->confirm('File ['.$to.'] already exists? Overwrite this file?')) { |
|
133 | 133 | return; |
134 | 134 | } |
135 | 135 | } |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | |
169 | 169 | $to = str_replace($this->dirs['base'], '', realpath($to)); |
170 | 170 | |
171 | - $this->line('<info>Copied ' . $type . '</info> <comment>[' . $from . ']</comment> <info>To</info> <comment>[' . $to . ']</comment>'); |
|
171 | + $this->line('<info>Copied '.$type.'</info> <comment>['.$from.']</comment> <info>To</info> <comment>['.$to.']</comment>'); |
|
172 | 172 | } |
173 | 173 | |
174 | 174 | protected function replacePlaceholders($content) |
@@ -186,17 +186,17 @@ discard block |
||
186 | 186 | |
187 | 187 | private function generateImportStatements(): string |
188 | 188 | { |
189 | - return collect(['\\' . Page::class]) |
|
190 | - ->map(function ($statement) { |
|
191 | - return 'use ' . $statement . ";\n "; |
|
189 | + return collect(['\\'.Page::class]) |
|
190 | + ->map(function($statement) { |
|
191 | + return 'use '.$statement.";\n "; |
|
192 | 192 | })->implode(''); |
193 | 193 | } |
194 | 194 | |
195 | 195 | private function generateTraitStatements(): string |
196 | 196 | { |
197 | 197 | return collect($this->chosenTraits) |
198 | - ->map(function ($statement) { |
|
199 | - return 'use ' . $statement . ";\n "; |
|
198 | + ->map(function($statement) { |
|
199 | + return 'use '.$statement.";\n "; |
|
200 | 200 | })->implode(''); |
201 | 201 | } |
202 | 202 | |
@@ -215,12 +215,12 @@ discard block |
||
215 | 215 | |
216 | 216 | // We make an estimated guess based on the project name. At Think Tomorrow, we |
217 | 217 | // have a src folder which is PSR-4 namespaced by the project name itself. |
218 | - return str_replace('\\\\', '\\', ucfirst(config('thinktomorrow.chief.domain.namespace', 'App')) . '\\' . ucfirst($this->plural)); |
|
218 | + return str_replace('\\\\', '\\', ucfirst(config('thinktomorrow.chief.domain.namespace', 'App')).'\\'.ucfirst($this->plural)); |
|
219 | 219 | } |
220 | 220 | |
221 | 221 | private function addToConfig($configKey, $value) |
222 | 222 | { |
223 | - $current_values = config('thinktomorrow.chief.' . $configKey); |
|
223 | + $current_values = config('thinktomorrow.chief.'.$configKey); |
|
224 | 224 | |
225 | 225 | if (is_array($current_values)) { |
226 | 226 | $value = array_merge($current_values, $value); |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | |
236 | 236 | // Find value - note: this regex does not work for nested arrays! |
237 | 237 | // Also creates array with the non-short syntax. |
238 | - $content = preg_replace('/[\'|"]' . $key . '[\'|"] ?=> ?(\[[^\]]*\]|[\'|"].*[\'|"])/', var_export($value, true), $content); |
|
238 | + $content = preg_replace('/[\'|"]'.$key.'[\'|"] ?=> ?(\[[^\]]*\]|[\'|"].*[\'|"])/', var_export($value, true), $content); |
|
239 | 239 | |
240 | 240 | file_put_contents($file, $content); |
241 | 241 | } |