@@ -87,9 +87,9 @@ |
||
| 87 | 87 | { |
| 88 | 88 | $namespace = $this->laravel['modules']->config('namespace'); |
| 89 | 89 | |
| 90 | - $namespace .= '\\' . $module->getStudlyName(); |
|
| 90 | + $namespace .= '\\'.$module->getStudlyName(); |
|
| 91 | 91 | |
| 92 | - $namespace .= '\\' . $this->getDefaultNamespace(); |
|
| 92 | + $namespace .= '\\'.$this->getDefaultNamespace(); |
|
| 93 | 93 | |
| 94 | 94 | $namespace = str_replace('/', '\\', $namespace); |
| 95 | 95 | |
@@ -18,9 +18,9 @@ |
||
| 18 | 18 | // This checks if we are running on a Laravel Vapor managed instance |
| 19 | 19 | // and sets the path to a writable one (services path is not on a writable storage in Vapor). |
| 20 | 20 | if (!is_null(env('VAPOR_MAINTENANCE_MODE', null))) { |
| 21 | - return Str::replaceLast('config.php', $this->getSnakeNamespace() . '_module.php', $this->app->getCachedConfigPath()); |
|
| 21 | + return Str::replaceLast('config.php', $this->getSnakeNamespace().'_module.php', $this->app->getCachedConfigPath()); |
|
| 22 | 22 | } |
| 23 | - return Str::replaceLast('services.php', $this->getSnakeNamespace() . '_module.php', $this->app->getCachedServicesPath()); |
|
| 23 | + return Str::replaceLast('services.php', $this->getSnakeNamespace().'_module.php', $this->app->getCachedServicesPath()); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | |
| 69 | 69 | $factoryPath = GenerateConfigReader::read('factory'); |
| 70 | 70 | |
| 71 | - return $path . $factoryPath->getPath() . '/' . $this->getFileName(); |
|
| 71 | + return $path.$factoryPath->getPath().'/'.$this->getFileName(); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | /** |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | */ |
| 77 | 77 | private function getFileName() |
| 78 | 78 | { |
| 79 | - return Str::studly($this->argument('name')) . 'Factory.php'; |
|
| 79 | + return Str::studly($this->argument('name')).'Factory.php'; |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | /** |
@@ -111,6 +111,6 @@ discard block |
||
| 111 | 111 | */ |
| 112 | 112 | public function getModelNamespace(): string |
| 113 | 113 | { |
| 114 | - return $this->laravel['modules']->config('namespace') . '\\' . $this->getModule()->getSubModuleOneSlashNamespace() . '\\' . $this->laravel['modules']->config('paths.generator.model.path', 'Entities'); |
|
| 114 | + return $this->laravel['modules']->config('namespace').'\\'.$this->getModule()->getSubModuleOneSlashNamespace().'\\'.$this->laravel['modules']->config('paths.generator.model.path', 'Entities'); |
|
| 115 | 115 | } |
| 116 | 116 | } |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | $paths = array_merge($paths, $this->config('scan.paths')); |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | - return array_map(function ($path) { |
|
| 120 | + return array_map(function($path) { |
|
| 121 | 121 | return Str::endsWith($path, '/*') ? $path : Str::finish($path, '/*'); |
| 122 | 122 | }, $paths); |
| 123 | 123 | } |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | */ |
| 200 | 200 | public function getCached() |
| 201 | 201 | { |
| 202 | - return $this->cache->remember($this->config('cache.key'), $this->config('cache.lifetime'), function () { |
|
| 202 | + return $this->cache->remember($this->config('cache.key'), $this->config('cache.lifetime'), function() { |
|
| 203 | 203 | return $this->toCollection()->toArray(); |
| 204 | 204 | }); |
| 205 | 205 | } |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | { |
| 289 | 289 | $modules = $this->allEnabled(); |
| 290 | 290 | |
| 291 | - uasort($modules, function (Module $a, Module $b) use ($direction) { |
|
| 291 | + uasort($modules, function(Module $a, Module $b) use ($direction) { |
|
| 292 | 292 | if ($a->get('priority') === $b->get('priority')) { |
| 293 | 293 | return 0; |
| 294 | 294 | } |
@@ -417,9 +417,9 @@ discard block |
||
| 417 | 417 | public function getModulePath($module) |
| 418 | 418 | { |
| 419 | 419 | try { |
| 420 | - return $this->findOrFail($module)->getPath() . '/'; |
|
| 420 | + return $this->findOrFail($module)->getPath().'/'; |
|
| 421 | 421 | } catch (ModuleNotFoundException $e) { |
| 422 | - return $this->getPath() . '/' . Str::studly($module) . '/'; |
|
| 422 | + return $this->getPath().'/'.Str::studly($module).'/'; |
|
| 423 | 423 | } |
| 424 | 424 | } |
| 425 | 425 | |
@@ -428,7 +428,7 @@ discard block |
||
| 428 | 428 | */ |
| 429 | 429 | public function assetPath(string $module): string |
| 430 | 430 | { |
| 431 | - return $this->config('paths.assets') . '/' . $module; |
|
| 431 | + return $this->config('paths.assets').'/'.$module; |
|
| 432 | 432 | } |
| 433 | 433 | |
| 434 | 434 | /** |
@@ -436,7 +436,7 @@ discard block |
||
| 436 | 436 | */ |
| 437 | 437 | public function config(string $key, $default = null) |
| 438 | 438 | { |
| 439 | - return $this->config->get('modules.' . $key, $default); |
|
| 439 | + return $this->config->get('modules.'.$key, $default); |
|
| 440 | 440 | } |
| 441 | 441 | |
| 442 | 442 | /** |
@@ -526,9 +526,9 @@ discard block |
||
| 526 | 526 | } |
| 527 | 527 | list($name, $url) = explode(':', $asset); |
| 528 | 528 | |
| 529 | - $baseUrl = str_replace(public_path() . DIRECTORY_SEPARATOR, '', $this->getAssetsPath()); |
|
| 529 | + $baseUrl = str_replace(public_path().DIRECTORY_SEPARATOR, '', $this->getAssetsPath()); |
|
| 530 | 530 | |
| 531 | - $url = $this->url->asset($baseUrl . "/{$name}/" . $url); |
|
| 531 | + $url = $this->url->asset($baseUrl."/{$name}/".$url); |
|
| 532 | 532 | |
| 533 | 533 | return str_replace(['http://', 'https://'], '//', $url); |
| 534 | 534 | } |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | continue; |
| 338 | 338 | } |
| 339 | 339 | |
| 340 | - $path = $this->module->getModulePath($this->getName()) . '/' . $folder->getPath(); |
|
| 340 | + $path = $this->module->getModulePath($this->getName()).'/'.$folder->getPath(); |
|
| 341 | 341 | |
| 342 | 342 | $this->filesystem->makeDirectory($path, 0755, true); |
| 343 | 343 | if (config('modules.stubs.gitkeep')) { |
@@ -353,7 +353,7 @@ discard block |
||
| 353 | 353 | */ |
| 354 | 354 | public function generateGitKeep($path) |
| 355 | 355 | { |
| 356 | - $this->filesystem->put($path . '/.gitkeep', ''); |
|
| 356 | + $this->filesystem->put($path.'/.gitkeep', ''); |
|
| 357 | 357 | } |
| 358 | 358 | |
| 359 | 359 | /** |
@@ -362,7 +362,7 @@ discard block |
||
| 362 | 362 | public function generateFiles() |
| 363 | 363 | { |
| 364 | 364 | foreach ($this->getFiles() as $stub => $file) { |
| 365 | - $path = $this->module->getModulePath($this->getName()) . $file; |
|
| 365 | + $path = $this->module->getModulePath($this->getName()).$file; |
|
| 366 | 366 | |
| 367 | 367 | if (!$this->filesystem->isDirectory($dir = dirname($path))) { |
| 368 | 368 | $this->filesystem->makeDirectory($dir, 0775, true); |
@@ -389,7 +389,7 @@ discard block |
||
| 389 | 389 | |
| 390 | 390 | if (GenerateConfigReader::read('provider')->generate() === true) { |
| 391 | 391 | $this->console->call('module:make-provider', [ |
| 392 | - 'name' => $this->getBaseName() . 'ServiceProvider', |
|
| 392 | + 'name' => $this->getBaseName().'ServiceProvider', |
|
| 393 | 393 | 'module' => $this->getName(), |
| 394 | 394 | '--master' => true, |
| 395 | 395 | ]); |
@@ -400,11 +400,11 @@ discard block |
||
| 400 | 400 | } |
| 401 | 401 | |
| 402 | 402 | if (GenerateConfigReader::read('controller')->generate() === true) { |
| 403 | - $options = $this->type=='api' ? ['--api'=>true] : []; |
|
| 403 | + $options = $this->type == 'api' ? ['--api'=>true] : []; |
|
| 404 | 404 | $this->console->call('module:make-controller', [ |
| 405 | - 'controller' => $this->getBaseName() . 'Controller', |
|
| 405 | + 'controller' => $this->getBaseName().'Controller', |
|
| 406 | 406 | 'module' => $this->getName(), |
| 407 | - ]+$options); |
|
| 407 | + ] + $options); |
|
| 408 | 408 | } |
| 409 | 409 | } |
| 410 | 410 | |
@@ -418,7 +418,7 @@ discard block |
||
| 418 | 418 | protected function getStubContents($stub) |
| 419 | 419 | { |
| 420 | 420 | return (new Stub( |
| 421 | - '/' . $stub . '.stub', |
|
| 421 | + '/'.$stub.'.stub', |
|
| 422 | 422 | $this->getReplacement($stub) |
| 423 | 423 | ) |
| 424 | 424 | )->render(); |
@@ -458,7 +458,7 @@ discard block |
||
| 458 | 458 | } |
| 459 | 459 | |
| 460 | 460 | foreach ($keys as $key) { |
| 461 | - if (method_exists($this, $method = 'get' . ucfirst(Str::studly(strtolower($key))) . 'Replacement')) { |
|
| 461 | + if (method_exists($this, $method = 'get'.ucfirst(Str::studly(strtolower($key))).'Replacement')) { |
|
| 462 | 462 | $replaces[$key] = $this->$method(); |
| 463 | 463 | } else { |
| 464 | 464 | $replaces[$key] = null; |
@@ -473,7 +473,7 @@ discard block |
||
| 473 | 473 | */ |
| 474 | 474 | private function generateModuleJsonFile() |
| 475 | 475 | { |
| 476 | - $path = $this->module->getModulePath($this->getName()) . 'module.json'; |
|
| 476 | + $path = $this->module->getModulePath($this->getName()).'module.json'; |
|
| 477 | 477 | |
| 478 | 478 | if (!$this->filesystem->isDirectory($dir = dirname($path))) { |
| 479 | 479 | $this->filesystem->makeDirectory($dir, 0775, true); |
@@ -490,13 +490,13 @@ discard block |
||
| 490 | 490 | */ |
| 491 | 491 | private function cleanModuleJsonFile() |
| 492 | 492 | { |
| 493 | - $path = $this->module->getModulePath($this->getName()) . 'module.json'; |
|
| 493 | + $path = $this->module->getModulePath($this->getName()).'module.json'; |
|
| 494 | 494 | |
| 495 | 495 | $content = $this->filesystem->get($path); |
| 496 | 496 | $namespace = $this->getModuleNamespaceReplacement(); |
| 497 | 497 | $studlyName = $this->getStudlyNameReplacement(); |
| 498 | 498 | |
| 499 | - $provider = '"' . $namespace . '\\\\' . $studlyName . '\\\\Providers\\\\' . $studlyName . 'ServiceProvider"'; |
|
| 499 | + $provider = '"'.$namespace.'\\\\'.$studlyName.'\\\\Providers\\\\'.$studlyName.'ServiceProvider"'; |
|
| 500 | 500 | |
| 501 | 501 | $content = str_replace($provider, '', $content); |
| 502 | 502 | |