@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | /** |
| 93 | 93 | * Get scanned modules paths. |
| 94 | 94 | * |
| 95 | - * @return array |
|
| 95 | + * @return string[] |
|
| 96 | 96 | */ |
| 97 | 97 | public function getScanPaths() |
| 98 | 98 | { |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | /** |
| 403 | 403 | * Get module path for a specific module. |
| 404 | 404 | * |
| 405 | - * @param $module |
|
| 405 | + * @param string $module |
|
| 406 | 406 | * |
| 407 | 407 | * @return string |
| 408 | 408 | */ |
@@ -430,7 +430,7 @@ discard block |
||
| 430 | 430 | /** |
| 431 | 431 | * Get a specific config data from a configuration file. |
| 432 | 432 | * |
| 433 | - * @param $key |
|
| 433 | + * @param string $key |
|
| 434 | 434 | * |
| 435 | 435 | * @param null $default |
| 436 | 436 | * @return mixed |
@@ -471,7 +471,7 @@ discard block |
||
| 471 | 471 | /** |
| 472 | 472 | * Get module used for cli session. |
| 473 | 473 | * |
| 474 | - * @return string |
|
| 474 | + * @return Module |
|
| 475 | 475 | */ |
| 476 | 476 | public function getUsedNow() |
| 477 | 477 | { |
@@ -481,7 +481,7 @@ discard block |
||
| 481 | 481 | /** |
| 482 | 482 | * Get used now. |
| 483 | 483 | * |
| 484 | - * @return string |
|
| 484 | + * @return Module |
|
| 485 | 485 | */ |
| 486 | 486 | public function getUsed() |
| 487 | 487 | { |
@@ -555,7 +555,7 @@ discard block |
||
| 555 | 555 | * |
| 556 | 556 | * @param string $name |
| 557 | 557 | * |
| 558 | - * @return bool |
|
| 558 | + * @return boolean|null |
|
| 559 | 559 | */ |
| 560 | 560 | public function enable($name) |
| 561 | 561 | { |
@@ -567,7 +567,7 @@ discard block |
||
| 567 | 567 | * |
| 568 | 568 | * @param string $name |
| 569 | 569 | * |
| 570 | - * @return bool |
|
| 570 | + * @return boolean|null |
|
| 571 | 571 | */ |
| 572 | 572 | public function disable($name) |
| 573 | 573 | { |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | { |
| 100 | 100 | $paths = $this->paths; |
| 101 | 101 | |
| 102 | - $paths[] = $this->getPath() . '/*'; |
|
| 102 | + $paths[] = $this->getPath().'/*'; |
|
| 103 | 103 | |
| 104 | 104 | if ($this->config('scan.enabled')) { |
| 105 | 105 | $paths = array_merge($paths, $this->config('scan.paths')); |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | */ |
| 146 | 146 | public function getCached() |
| 147 | 147 | { |
| 148 | - return $this->app['cache']->remember($this->config('cache.key'), $this->config('cache.lifetime'), function () { |
|
| 148 | + return $this->app['cache']->remember($this->config('cache.key'), $this->config('cache.lifetime'), function() { |
|
| 149 | 149 | return $this->toCollection()->toArray(); |
| 150 | 150 | }); |
| 151 | 151 | } |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | { |
| 234 | 234 | $modules = $this->enabled(); |
| 235 | 235 | |
| 236 | - uasort($modules, function (Module $a, Module $b) use ($direction) { |
|
| 236 | + uasort($modules, function(Module $a, Module $b) use ($direction) { |
|
| 237 | 237 | if ($a->order == $b->order) { |
| 238 | 238 | return 0; |
| 239 | 239 | } |
@@ -382,9 +382,9 @@ discard block |
||
| 382 | 382 | public function getModulePath($module) |
| 383 | 383 | { |
| 384 | 384 | try { |
| 385 | - return $this->findOrFail($module)->getPath() . '/'; |
|
| 385 | + return $this->findOrFail($module)->getPath().'/'; |
|
| 386 | 386 | } catch (ModuleNotFoundException $e) { |
| 387 | - return $this->getPath() . '/' . Str::studly($module) . '/'; |
|
| 387 | + return $this->getPath().'/'.Str::studly($module).'/'; |
|
| 388 | 388 | } |
| 389 | 389 | } |
| 390 | 390 | |
@@ -397,7 +397,7 @@ discard block |
||
| 397 | 397 | */ |
| 398 | 398 | public function assetPath($module) |
| 399 | 399 | { |
| 400 | - return $this->config('paths.assets') . '/' . $module; |
|
| 400 | + return $this->config('paths.assets').'/'.$module; |
|
| 401 | 401 | } |
| 402 | 402 | |
| 403 | 403 | /** |
@@ -410,7 +410,7 @@ discard block |
||
| 410 | 410 | */ |
| 411 | 411 | public function config($key, $default = null) |
| 412 | 412 | { |
| 413 | - return $this->app['config']->get('modules.' . $key, $default); |
|
| 413 | + return $this->app['config']->get('modules.'.$key, $default); |
|
| 414 | 414 | } |
| 415 | 415 | |
| 416 | 416 | /** |
@@ -501,9 +501,9 @@ discard block |
||
| 501 | 501 | } |
| 502 | 502 | list($name, $url) = explode(':', $asset); |
| 503 | 503 | |
| 504 | - $baseUrl = str_replace(public_path() . DIRECTORY_SEPARATOR, '', $this->getAssetsPath()); |
|
| 504 | + $baseUrl = str_replace(public_path().DIRECTORY_SEPARATOR, '', $this->getAssetsPath()); |
|
| 505 | 505 | |
| 506 | - $url = $this->app['url']->asset($baseUrl . "/{$name}/" . $url); |
|
| 506 | + $url = $this->app['url']->asset($baseUrl."/{$name}/".$url); |
|
| 507 | 507 | |
| 508 | 508 | return str_replace(['http://', 'https://'], '//', $url); |
| 509 | 509 | } |
@@ -90,7 +90,7 @@ |
||
| 90 | 90 | /** |
| 91 | 91 | * Get matches data from regex. |
| 92 | 92 | * |
| 93 | - * @return array |
|
| 93 | + * @return string[] |
|
| 94 | 94 | */ |
| 95 | 95 | public function getMatches() |
| 96 | 96 | { |
@@ -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 | } |
@@ -242,7 +242,7 @@ |
||
| 242 | 242 | * |
| 243 | 243 | * @param string $migration |
| 244 | 244 | * |
| 245 | - * @return mixed |
|
| 245 | + * @return boolean |
|
| 246 | 246 | */ |
| 247 | 247 | public function log($migration) |
| 248 | 248 | { |
@@ -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 | } |
@@ -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 | } |
@@ -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 | } |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | foreach ($this->module->getOrdered($this->option('direction')) as $module) { |
| 50 | - $this->line('Running for module: <info>' . $module->getName() . '</info>'); |
|
| 50 | + $this->line('Running for module: <info>'.$module->getName().'</info>'); |
|
| 51 | 51 | |
| 52 | 52 | $this->migrate($module); |
| 53 | 53 | } |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | $path = str_replace(base_path(), '', (new Migrator($module))->getPath()); |
| 64 | 64 | |
| 65 | 65 | if ($this->option('subpath')) { |
| 66 | - $path = $path . "/" . $this->option("subpath"); |
|
| 66 | + $path = $path."/".$this->option("subpath"); |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | $this->call('migrate', [ |