@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | { |
96 | 96 | $paths = $this->paths; |
97 | 97 | |
98 | - $paths[] = $this->getPath() . '/*'; |
|
98 | + $paths[] = $this->getPath().'/*'; |
|
99 | 99 | |
100 | 100 | if ($this->config('scan.enabled')) { |
101 | 101 | $paths = array_merge($paths, $this->config('scan.paths')); |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | $modules = []; |
157 | 157 | |
158 | 158 | foreach ($cached as $name => $module) { |
159 | - $path = $this->config('paths.modules') . '/' . $name; |
|
159 | + $path = $this->config('paths.modules').'/'.$name; |
|
160 | 160 | |
161 | 161 | $modules[$name] = new Module($this->app, $name, $path); |
162 | 162 | } |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | */ |
172 | 172 | public function getCached() |
173 | 173 | { |
174 | - return $this->app['cache']->remember($this->config('cache.key'), $this->config('cache.lifetime'), function () { |
|
174 | + return $this->app['cache']->remember($this->config('cache.key'), $this->config('cache.lifetime'), function() { |
|
175 | 175 | return $this->toCollection()->toArray(); |
176 | 176 | }); |
177 | 177 | } |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | { |
260 | 260 | $modules = $this->enabled(); |
261 | 261 | |
262 | - uasort($modules, function (Module $a, Module $b) use ($direction) { |
|
262 | + uasort($modules, function(Module $a, Module $b) use ($direction) { |
|
263 | 263 | if ($a->order == $b->order) { |
264 | 264 | return 0; |
265 | 265 | } |
@@ -370,9 +370,9 @@ discard block |
||
370 | 370 | public function getModulePath($module) |
371 | 371 | { |
372 | 372 | try { |
373 | - return $this->findOrFail($module)->getPath() . '/'; |
|
373 | + return $this->findOrFail($module)->getPath().'/'; |
|
374 | 374 | } catch (ModuleNotFoundException $e) { |
375 | - return $this->getPath() . '/' . Str::studly($module) . '/'; |
|
375 | + return $this->getPath().'/'.Str::studly($module).'/'; |
|
376 | 376 | } |
377 | 377 | } |
378 | 378 | |
@@ -385,7 +385,7 @@ discard block |
||
385 | 385 | */ |
386 | 386 | public function assetPath($module) |
387 | 387 | { |
388 | - return $this->config('paths.assets') . '/' . $module; |
|
388 | + return $this->config('paths.assets').'/'.$module; |
|
389 | 389 | } |
390 | 390 | |
391 | 391 | /** |
@@ -398,7 +398,7 @@ discard block |
||
398 | 398 | */ |
399 | 399 | public function config($key, $default = null) |
400 | 400 | { |
401 | - return $this->app['config']->get('modules.' . $key, $default); |
|
401 | + return $this->app['config']->get('modules.'.$key, $default); |
|
402 | 402 | } |
403 | 403 | |
404 | 404 | /** |
@@ -412,7 +412,7 @@ discard block |
||
412 | 412 | $this->app['files']->makeDirectory($path, 0777, true); |
413 | 413 | } |
414 | 414 | |
415 | - return $path . '/modules.used'; |
|
415 | + return $path.'/modules.used'; |
|
416 | 416 | } |
417 | 417 | |
418 | 418 | /** |
@@ -480,9 +480,9 @@ discard block |
||
480 | 480 | { |
481 | 481 | list($name, $url) = explode(':', $asset); |
482 | 482 | |
483 | - $baseUrl = str_replace(public_path() . DIRECTORY_SEPARATOR, '', $this->getAssetsPath()); |
|
483 | + $baseUrl = str_replace(public_path().DIRECTORY_SEPARATOR, '', $this->getAssetsPath()); |
|
484 | 484 | |
485 | - $url = $this->app['url']->asset($baseUrl . "/{$name}/" . $url); |
|
485 | + $url = $this->app['url']->asset($baseUrl."/{$name}/".$url); |
|
486 | 486 | |
487 | 487 | return str_replace(['http://', 'https://'], '//', $url); |
488 | 488 | } |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | */ |
84 | 84 | public function getMigrations($reverse = false) |
85 | 85 | { |
86 | - $files = $this->laravel['files']->glob($this->getPath() . '/*_*.php'); |
|
86 | + $files = $this->laravel['files']->glob($this->getPath().'/*_*.php'); |
|
87 | 87 | |
88 | 88 | // Once we have the array of files in the directory we will just remove the |
89 | 89 | // extension and take the basename of the file which is all we need when |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | return array(); |
93 | 93 | } |
94 | 94 | |
95 | - $files = array_map(function ($file) { |
|
95 | + $files = array_map(function($file) { |
|
96 | 96 | return str_replace('.php', '', basename($file)); |
97 | 97 | |
98 | 98 | }, $files); |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | { |
211 | 211 | $path = $this->getPath(); |
212 | 212 | foreach ($files as $file) { |
213 | - $this->laravel['files']->requireOnce($path . '/' . $file . '.php'); |
|
213 | + $this->laravel['files']->requireOnce($path.'/'.$file.'.php'); |
|
214 | 214 | } |
215 | 215 | } |
216 | 216 | |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | |
290 | 290 | $result = $query->orderBy('migration', 'desc')->get(); |
291 | 291 | |
292 | - return collect($result)->map(function ($item) { |
|
292 | + return collect($result)->map(function($item) { |
|
293 | 293 | return (array) $item; |
294 | 294 | })->pluck('migration'); |
295 | 295 | } |
@@ -49,7 +49,7 @@ |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | foreach ($this->module->getOrdered($this->option('direction')) as $module) { |
52 | - $this->line('Running for module: <info>' . $module->getName() . '</info>'); |
|
52 | + $this->line('Running for module: <info>'.$module->getName().'</info>'); |
|
53 | 53 | |
54 | 54 | $this->rollback($module); |
55 | 55 | } |
@@ -49,7 +49,7 @@ |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | foreach ($this->module->getOrdered($this->option('direction')) as $module) { |
52 | - $this->line('Running for module: <info>' . $module->getName() . '</info>'); |
|
52 | + $this->line('Running for module: <info>'.$module->getName().'</info>'); |
|
53 | 53 | |
54 | 54 | $this->reset($module); |
55 | 55 | } |
@@ -45,7 +45,7 @@ |
||
45 | 45 | |
46 | 46 | $mailPath = $this->laravel['modules']->config('paths.generator.notifications', 'Notifications'); |
47 | 47 | |
48 | - return $path . $mailPath . '/' . $this->getFileName() . '.php'; |
|
48 | + return $path.$mailPath.'/'.$this->getFileName().'.php'; |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | /** |
@@ -86,11 +86,11 @@ |
||
86 | 86 | |
87 | 87 | $namespace = $this->laravel['modules']->config('namespace'); |
88 | 88 | |
89 | - $namespace .= '\\' . $module->getStudlyName(); |
|
89 | + $namespace .= '\\'.$module->getStudlyName(); |
|
90 | 90 | |
91 | - $namespace .= '\\' . $this->getDefaultNamespace(); |
|
91 | + $namespace .= '\\'.$this->getDefaultNamespace(); |
|
92 | 92 | |
93 | - $namespace .= '\\' . $extra; |
|
93 | + $namespace .= '\\'.$extra; |
|
94 | 94 | |
95 | 95 | return trim($namespace, '\\'); |
96 | 96 | } |
@@ -65,7 +65,7 @@ |
||
65 | 65 | |
66 | 66 | $mailPath = $this->laravel['modules']->config('paths.generator.emails', 'Emails'); |
67 | 67 | |
68 | - return $path . $mailPath . '/' . $this->getFileName() . '.php'; |
|
68 | + return $path.$mailPath.'/'.$this->getFileName().'.php'; |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |
@@ -123,14 +123,14 @@ |
||
123 | 123 | |
124 | 124 | // any JSON parsing errors should throw an exception |
125 | 125 | if (json_last_error() > 0) { |
126 | - throw new InvalidJsonException('Error processing file: ' . $this->getPath() . '. Error: ' . json_last_error_msg()); |
|
126 | + throw new InvalidJsonException('Error processing file: '.$this->getPath().'. Error: '.json_last_error_msg()); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | if (config('modules.cache.enabled') === false) { |
130 | 130 | return $attributes; |
131 | 131 | } |
132 | 132 | |
133 | - return app('cache')->remember($this->getPath(), config('modules.cache.lifetime'), function () use ($attributes) { |
|
133 | + return app('cache')->remember($this->getPath(), config('modules.cache.lifetime'), function() use ($attributes) { |
|
134 | 134 | return $attributes; |
135 | 135 | }); |
136 | 136 | } |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | */ |
145 | 145 | public function createField($column, $attributes, $type = 'add') |
146 | 146 | { |
147 | - $results = "\t\t\t" . '$table'; |
|
147 | + $results = "\t\t\t".'$table'; |
|
148 | 148 | |
149 | 149 | foreach ($attributes as $key => $field) { |
150 | 150 | if (in_array($column, $this->relationshipKeys)) { |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | } |
155 | 155 | } |
156 | 156 | |
157 | - return $results . ';' . PHP_EOL; |
|
157 | + return $results.';'.PHP_EOL; |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | /** |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | */ |
169 | 169 | protected function addRelationColumn($key, $field, $column) |
170 | 170 | { |
171 | - $relatedColumn = snake_case(class_basename($field)) . '_id'; |
|
171 | + $relatedColumn = snake_case(class_basename($field)).'_id'; |
|
172 | 172 | |
173 | 173 | $method = 'integer'; |
174 | 174 | |
@@ -187,18 +187,18 @@ discard block |
||
187 | 187 | protected function addColumn($key, $field, $column) |
188 | 188 | { |
189 | 189 | if ($this->hasCustomAttribute($column)) { |
190 | - return '->' . $field; |
|
190 | + return '->'.$field; |
|
191 | 191 | } |
192 | 192 | |
193 | 193 | if ($key == 0) { |
194 | - return '->' . $field . "('" . $column . "')"; |
|
194 | + return '->'.$field."('".$column."')"; |
|
195 | 195 | } |
196 | 196 | |
197 | 197 | if (str_contains($field, '(')) { |
198 | - return '->' . $field; |
|
198 | + return '->'.$field; |
|
199 | 199 | } |
200 | 200 | |
201 | - return '->' . $field . '()'; |
|
201 | + return '->'.$field.'()'; |
|
202 | 202 | } |
203 | 203 | |
204 | 204 | /** |
@@ -213,10 +213,10 @@ discard block |
||
213 | 213 | protected function removeColumn($key, $field, $column) |
214 | 214 | { |
215 | 215 | if ($this->hasCustomAttribute($column)) { |
216 | - return '->' . $field; |
|
216 | + return '->'.$field; |
|
217 | 217 | } |
218 | 218 | |
219 | - return '->dropColumn(' . "'" . $column . "')"; |
|
219 | + return '->dropColumn('."'".$column."')"; |
|
220 | 220 | } |
221 | 221 | |
222 | 222 | /** |
@@ -241,7 +241,7 @@ discard block |
||
241 | 241 | */ |
242 | 242 | public function getAttributes($column, $schema) |
243 | 243 | { |
244 | - $fields = str_replace($column . ':', '', $schema); |
|
244 | + $fields = str_replace($column.':', '', $schema); |
|
245 | 245 | |
246 | 246 | return $this->hasCustomAttribute($column) ? $this->getCustomAttribute($column) : explode(':', $fields); |
247 | 247 | } |