@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | /** @var Module $module */ |
| 76 | 76 | $module = $this->laravel['modules']->findOrFail($this->getModuleName()); |
| 77 | 77 | |
| 78 | - return (new Stub('/' . $stub . '.stub', [ |
|
| 78 | + return (new Stub('/'.$stub.'.stub', [ |
|
| 79 | 79 | 'NAMESPACE' => $this->getClassNamespace($module), |
| 80 | 80 | 'CLASS' => $this->getClass(), |
| 81 | 81 | 'LOWER_NAME' => $module->getLowerName(), |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | |
| 101 | 101 | $generatorPath = GenerateConfigReader::read('provider'); |
| 102 | 102 | |
| 103 | - return $path . $generatorPath->getPath() . '/' . $this->getFileName() . '.php'; |
|
| 103 | + return $path.$generatorPath->getPath().'/'.$this->getFileName().'.php'; |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | /** |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | |
| 25 | 25 | 'stubs' => [ |
| 26 | 26 | 'enabled' => false, |
| 27 | - 'path' => base_path() . '/vendor/nwidart/laravel-modules/src/Commands/stubs', |
|
| 27 | + 'path' => base_path().'/vendor/nwidart/laravel-modules/src/Commands/stubs', |
|
| 28 | 28 | 'files' => [ |
| 29 | 29 | 'routes/web' => 'Routes/web.php', |
| 30 | 30 | 'routes/api' => 'Routes/api.php', |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | */ |
| 147 | 147 | public function createField($column, $attributes, $type = 'add') |
| 148 | 148 | { |
| 149 | - $results = "\t\t\t" . '$table'; |
|
| 149 | + $results = "\t\t\t".'$table'; |
|
| 150 | 150 | |
| 151 | 151 | foreach ($attributes as $key => $field) { |
| 152 | 152 | if (in_array($column, $this->relationshipKeys)) { |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | } |
| 157 | 157 | } |
| 158 | 158 | |
| 159 | - return $results . ';' . PHP_EOL; |
|
| 159 | + return $results.';'.PHP_EOL; |
|
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | /** |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | */ |
| 171 | 171 | protected function addRelationColumn($key, $field, $column) |
| 172 | 172 | { |
| 173 | - $relatedColumn = Str::snake(class_basename($field)) . '_id'; |
|
| 173 | + $relatedColumn = Str::snake(class_basename($field)).'_id'; |
|
| 174 | 174 | |
| 175 | 175 | $method = 'integer'; |
| 176 | 176 | |
@@ -189,18 +189,18 @@ discard block |
||
| 189 | 189 | protected function addColumn($key, $field, $column) |
| 190 | 190 | { |
| 191 | 191 | if ($this->hasCustomAttribute($column)) { |
| 192 | - return '->' . $field; |
|
| 192 | + return '->'.$field; |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | if ($key == 0) { |
| 196 | - return '->' . $field . "('" . $column . "')"; |
|
| 196 | + return '->'.$field."('".$column."')"; |
|
| 197 | 197 | } |
| 198 | 198 | |
| 199 | 199 | if (Str::contains($field, '(')) { |
| 200 | - return '->' . $field; |
|
| 200 | + return '->'.$field; |
|
| 201 | 201 | } |
| 202 | 202 | |
| 203 | - return '->' . $field . '()'; |
|
| 203 | + return '->'.$field.'()'; |
|
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | /** |
@@ -215,10 +215,10 @@ discard block |
||
| 215 | 215 | protected function removeColumn($key, $field, $column) |
| 216 | 216 | { |
| 217 | 217 | if ($this->hasCustomAttribute($column)) { |
| 218 | - return '->' . $field; |
|
| 218 | + return '->'.$field; |
|
| 219 | 219 | } |
| 220 | 220 | |
| 221 | - return '->dropColumn(' . "'" . $column . "')"; |
|
| 221 | + return '->dropColumn('."'".$column."')"; |
|
| 222 | 222 | } |
| 223 | 223 | |
| 224 | 224 | /** |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | */ |
| 244 | 244 | public function getAttributes($column, $schema) |
| 245 | 245 | { |
| 246 | - $fields = str_replace($column . ':', '', $schema); |
|
| 246 | + $fields = str_replace($column.':', '', $schema); |
|
| 247 | 247 | |
| 248 | 248 | return $this->hasCustomAttribute($column) ? $this->getCustomAttribute($column) : explode(':', $fields); |
| 249 | 249 | } |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | continue; |
| 283 | 283 | } |
| 284 | 284 | |
| 285 | - $path = $this->module->getModulePath($this->getName()) . '/' . $folder->getPath(); |
|
| 285 | + $path = $this->module->getModulePath($this->getName()).'/'.$folder->getPath(); |
|
| 286 | 286 | |
| 287 | 287 | $this->filesystem->makeDirectory($path, 0755, true); |
| 288 | 288 | if (config('modules.stubs.gitkeep')) { |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | */ |
| 299 | 299 | public function generateGitKeep($path) |
| 300 | 300 | { |
| 301 | - $this->filesystem->put($path . '/.gitkeep', ''); |
|
| 301 | + $this->filesystem->put($path.'/.gitkeep', ''); |
|
| 302 | 302 | } |
| 303 | 303 | |
| 304 | 304 | /** |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | public function generateFiles() |
| 308 | 308 | { |
| 309 | 309 | foreach ($this->getFiles() as $stub => $file) { |
| 310 | - $path = $this->module->getModulePath($this->getName()) . $file; |
|
| 310 | + $path = $this->module->getModulePath($this->getName()).$file; |
|
| 311 | 311 | |
| 312 | 312 | if (!$this->filesystem->isDirectory($dir = dirname($path))) { |
| 313 | 313 | $this->filesystem->makeDirectory($dir, 0775, true); |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | ]); |
| 332 | 332 | |
| 333 | 333 | $this->console->call('module:make-provider', [ |
| 334 | - 'name' => $this->getName() . 'ServiceProvider', |
|
| 334 | + 'name' => $this->getName().'ServiceProvider', |
|
| 335 | 335 | 'module' => $this->getName(), |
| 336 | 336 | '--master' => true, |
| 337 | 337 | ]); |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | ]); |
| 342 | 342 | |
| 343 | 343 | $this->console->call('module:make-controller', [ |
| 344 | - 'controller' => $this->getName() . 'Controller', |
|
| 344 | + 'controller' => $this->getName().'Controller', |
|
| 345 | 345 | 'module' => $this->getName(), |
| 346 | 346 | ]); |
| 347 | 347 | } |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | protected function getStubContents($stub) |
| 357 | 357 | { |
| 358 | 358 | return (new Stub( |
| 359 | - '/' . $stub . '.stub', |
|
| 359 | + '/'.$stub.'.stub', |
|
| 360 | 360 | $this->getReplacement($stub) |
| 361 | 361 | ) |
| 362 | 362 | )->render(); |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | $replaces = []; |
| 391 | 391 | |
| 392 | 392 | foreach ($keys as $key) { |
| 393 | - if (method_exists($this, $method = 'get' . ucfirst(Str::studly(strtolower($key))) . 'Replacement')) { |
|
| 393 | + if (method_exists($this, $method = 'get'.ucfirst(Str::studly(strtolower($key))).'Replacement')) { |
|
| 394 | 394 | $replaces[$key] = $this->$method(); |
| 395 | 395 | } else { |
| 396 | 396 | $replaces[$key] = null; |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | */ |
| 406 | 406 | private function generateModuleJsonFile() |
| 407 | 407 | { |
| 408 | - $path = $this->module->getModulePath($this->getName()) . 'module.json'; |
|
| 408 | + $path = $this->module->getModulePath($this->getName()).'module.json'; |
|
| 409 | 409 | |
| 410 | 410 | if (!$this->filesystem->isDirectory($dir = dirname($path))) { |
| 411 | 411 | $this->filesystem->makeDirectory($dir, 0775, true); |
@@ -422,13 +422,13 @@ discard block |
||
| 422 | 422 | */ |
| 423 | 423 | private function cleanModuleJsonFile() |
| 424 | 424 | { |
| 425 | - $path = $this->module->getModulePath($this->getName()) . 'module.json'; |
|
| 425 | + $path = $this->module->getModulePath($this->getName()).'module.json'; |
|
| 426 | 426 | |
| 427 | 427 | $content = $this->filesystem->get($path); |
| 428 | 428 | $namespace = $this->getModuleNamespaceReplacement(); |
| 429 | 429 | $studlyName = $this->getStudlyNameReplacement(); |
| 430 | 430 | |
| 431 | - $provider = '"' . $namespace . '\\\\' . $studlyName . '\\\\Providers\\\\' . $studlyName . 'ServiceProvider"'; |
|
| 431 | + $provider = '"'.$namespace.'\\\\'.$studlyName.'\\\\Providers\\\\'.$studlyName.'ServiceProvider"'; |
|
| 432 | 432 | |
| 433 | 433 | $content = str_replace($provider, '', $content); |
| 434 | 434 | |
@@ -80,7 +80,7 @@ |
||
| 80 | 80 | $testPath = GenerateConfigReader::read('test'); |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | - return $path . $testPath->getPath() . '/' . $this->getFileName() . '.php'; |
|
| 83 | + return $path.$testPath->getPath().'/'.$this->getFileName().'.php'; |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | /** |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | |
| 87 | 87 | $generatorPath = GenerateConfigReader::read('provider'); |
| 88 | 88 | |
| 89 | - return $path . $generatorPath->getPath() . '/' . $this->getFileName() . '.php'; |
|
| 89 | + return $path.$generatorPath->getPath().'/'.$this->getFileName().'.php'; |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | /** |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | */ |
| 95 | 95 | protected function getWebRoutesPath() |
| 96 | 96 | { |
| 97 | - return '/' . $this->laravel['modules']->config('stubs.files.routes/web', 'Routes/web.php'); |
|
| 97 | + return '/'.$this->laravel['modules']->config('stubs.files.routes/web', 'Routes/web.php'); |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | /** |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | */ |
| 103 | 103 | protected function getApiRoutesPath() |
| 104 | 104 | { |
| 105 | - return '/' . $this->laravel['modules']->config('stubs.files.routes/api', 'Routes/api.php'); |
|
| 105 | + return '/'.$this->laravel['modules']->config('stubs.files.routes/api', 'Routes/api.php'); |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | public function getDefaultNamespace() : string |
@@ -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, $this->getLaravel()))->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', [ |
@@ -126,9 +126,7 @@ discard block |
||
| 126 | 126 | /** |
| 127 | 127 | * Creates a new Module instance |
| 128 | 128 | * |
| 129 | - * @param Container $app |
|
| 130 | - * @param string $args |
|
| 131 | - * @param string $path |
|
| 129 | + * @param string[] $args |
|
| 132 | 130 | * @return \Nwidart\Modules\Module |
| 133 | 131 | */ |
| 134 | 132 | abstract protected function createModule(...$args); |
@@ -632,7 +630,7 @@ discard block |
||
| 632 | 630 | /** |
| 633 | 631 | * Get stub path. |
| 634 | 632 | * |
| 635 | - * @return string|null |
|
| 633 | + * @return string|boolean |
|
| 636 | 634 | */ |
| 637 | 635 | public function getStubPath() |
| 638 | 636 | { |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | $paths = array_merge($paths, $this->config('scan.paths')); |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | - $paths = array_map(function ($path) { |
|
| 119 | + $paths = array_map(function($path) { |
|
| 120 | 120 | return Str::endsWith($path, '/*') ? $path : Str::finish($path, '/*'); |
| 121 | 121 | }, $paths); |
| 122 | 122 | |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | */ |
| 201 | 201 | public function getCached() |
| 202 | 202 | { |
| 203 | - return $this->cache->remember($this->config('cache.key'), $this->config('cache.lifetime'), function () { |
|
| 203 | + return $this->cache->remember($this->config('cache.key'), $this->config('cache.lifetime'), function() { |
|
| 204 | 204 | return $this->toCollection()->toArray(); |
| 205 | 205 | }); |
| 206 | 206 | } |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | { |
| 290 | 290 | $modules = $this->allEnabled(); |
| 291 | 291 | |
| 292 | - uasort($modules, function (Module $a, Module $b) use ($direction) { |
|
| 292 | + uasort($modules, function(Module $a, Module $b) use ($direction) { |
|
| 293 | 293 | if ($a->get('order') === $b->get('order')) { |
| 294 | 294 | return 0; |
| 295 | 295 | } |
@@ -418,9 +418,9 @@ discard block |
||
| 418 | 418 | public function getModulePath($module) |
| 419 | 419 | { |
| 420 | 420 | try { |
| 421 | - return $this->findOrFail($module)->getPath() . '/'; |
|
| 421 | + return $this->findOrFail($module)->getPath().'/'; |
|
| 422 | 422 | } catch (ModuleNotFoundException $e) { |
| 423 | - return $this->getPath() . '/' . Str::studly($module) . '/'; |
|
| 423 | + return $this->getPath().'/'.Str::studly($module).'/'; |
|
| 424 | 424 | } |
| 425 | 425 | } |
| 426 | 426 | |
@@ -429,7 +429,7 @@ discard block |
||
| 429 | 429 | */ |
| 430 | 430 | public function assetPath(string $module) : string |
| 431 | 431 | { |
| 432 | - return $this->config('paths.assets') . '/' . $module; |
|
| 432 | + return $this->config('paths.assets').'/'.$module; |
|
| 433 | 433 | } |
| 434 | 434 | |
| 435 | 435 | /** |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | */ |
| 438 | 438 | public function config(string $key, $default = null) |
| 439 | 439 | { |
| 440 | - return $this->config->get('modules.' . $key, $default); |
|
| 440 | + return $this->config->get('modules.'.$key, $default); |
|
| 441 | 441 | } |
| 442 | 442 | |
| 443 | 443 | /** |
@@ -527,9 +527,9 @@ discard block |
||
| 527 | 527 | } |
| 528 | 528 | list($name, $url) = explode(':', $asset); |
| 529 | 529 | |
| 530 | - $baseUrl = str_replace(public_path() . DIRECTORY_SEPARATOR, '', $this->getAssetsPath()); |
|
| 530 | + $baseUrl = str_replace(public_path().DIRECTORY_SEPARATOR, '', $this->getAssetsPath()); |
|
| 531 | 531 | |
| 532 | - $url = $this->url->asset($baseUrl . "/{$name}/" . $url); |
|
| 532 | + $url = $this->url->asset($baseUrl."/{$name}/".$url); |
|
| 533 | 533 | |
| 534 | 534 | return str_replace(['http://', 'https://'], '//', $url); |
| 535 | 535 | } |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | $name = $module->getName(); |
| 98 | 98 | $config = $module->get('migration'); |
| 99 | 99 | if (is_array($config) && array_key_exists('seeds', $config)) { |
| 100 | - foreach ((array)$config['seeds'] as $class) { |
|
| 100 | + foreach ((array) $config['seeds'] as $class) { |
|
| 101 | 101 | if (class_exists($class)) { |
| 102 | 102 | $seeders[] = $class; |
| 103 | 103 | } |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | protected function dbSeed($className) |
| 132 | 132 | { |
| 133 | 133 | if ($option = $this->option('class')) { |
| 134 | - $params['--class'] = Str::finish(substr($className, 0, strrpos($className, '\\')), '\\') . $option; |
|
| 134 | + $params['--class'] = Str::finish(substr($className, 0, strrpos($className, '\\')), '\\').$option; |
|
| 135 | 135 | } else { |
| 136 | 136 | $params = ['--class' => $className]; |
| 137 | 137 | } |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | $config = GenerateConfigReader::read('seeder'); |
| 163 | 163 | $seederPath = str_replace('/', '\\', $config->getPath()); |
| 164 | 164 | |
| 165 | - return $namespace . '\\' . $name . '\\' . $config->getNamespace() . '\\' . $name . 'DatabaseSeeder'; |
|
| 165 | + return $namespace.'\\'.$name.'\\'.$config->getNamespace().'\\'.$name.'DatabaseSeeder'; |
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | /** |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | $foundModules = []; |
| 183 | 183 | foreach ($this->laravel['modules']->config('scan.paths') as $path) { |
| 184 | 184 | $namespace = array_slice(explode('/', $path), -1)[0]; |
| 185 | - $foundModules[] = $namespace . '\\' . $name . '\\' . $seederPath . '\\' . $name . 'DatabaseSeeder'; |
|
| 185 | + $foundModules[] = $namespace.'\\'.$name.'\\'.$seederPath.'\\'.$name.'DatabaseSeeder'; |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | return $foundModules; |