@@ -71,9 +71,9 @@ discard block |
||
71 | 71 | */ |
72 | 72 | public function getPath() |
73 | 73 | { |
74 | - $path = static::getBasePath() . $this->path; |
|
74 | + $path = static::getBasePath().$this->path; |
|
75 | 75 | |
76 | - return file_exists($path) ? $path : __DIR__ . '/../Commands/stubs' . $this->path; |
|
76 | + return file_exists($path) ? $path : __DIR__.'/../Commands/stubs'.$this->path; |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | /** |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | $contents = file_get_contents($this->getPath()); |
107 | 107 | |
108 | 108 | foreach ($this->replaces as $search => $replace) { |
109 | - $contents = str_replace('$' . strtoupper($search) . '$', $replace, $contents); |
|
109 | + $contents = str_replace('$'.strtoupper($search).'$', $replace, $contents); |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | return $contents; |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | */ |
133 | 133 | public function saveTo($path, $filename) |
134 | 134 | { |
135 | - return file_put_contents($path . '/' . $filename, $this->getContents()); |
|
135 | + return file_put_contents($path.'/'.$filename, $this->getContents()); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | /** |
@@ -45,7 +45,7 @@ |
||
45 | 45 | |
46 | 46 | protected function updateModule($name) |
47 | 47 | { |
48 | - $this->line('Running for module: <info>' . $name . '</info>'); |
|
48 | + $this->line('Running for module: <info>'.$name.'</info>'); |
|
49 | 49 | |
50 | 50 | $this->laravel['modules']->update($name); |
51 | 51 |
@@ -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', |
@@ -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 |
@@ -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 | } |
@@ -239,7 +239,7 @@ |
||
239 | 239 | /** |
240 | 240 | * Get a specific data from composer.json file by given the key. |
241 | 241 | * |
242 | - * @param $key |
|
242 | + * @param string $key |
|
243 | 243 | * @param null $default |
244 | 244 | * |
245 | 245 | * @return mixed |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | { |
204 | 204 | $lowerName = $this->getLowerName(); |
205 | 205 | |
206 | - $langPath = $this->getPath() . config('modules.paths.generator.lang.namespace', config('modules.paths.generator.lang.path')); |
|
206 | + $langPath = $this->getPath().config('modules.paths.generator.lang.namespace', config('modules.paths.generator.lang.path')); |
|
207 | 207 | |
208 | 208 | if (is_dir($langPath)) { |
209 | 209 | $this->loadTranslationsFrom($langPath, $lowerName); |
@@ -223,8 +223,8 @@ discard block |
||
223 | 223 | $file = 'module.json'; |
224 | 224 | } |
225 | 225 | |
226 | - return Arr::get($this->moduleJson, $file, function () use ($file) { |
|
227 | - return $this->moduleJson[$file] = new Json($this->getPath() . '/' . $file, $this->files); |
|
226 | + return Arr::get($this->moduleJson, $file, function() use ($file) { |
|
227 | + return $this->moduleJson[$file] = new Json($this->getPath().'/'.$file, $this->files); |
|
228 | 228 | }); |
229 | 229 | } |
230 | 230 | |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | */ |
278 | 278 | protected function fireEvent($event): void |
279 | 279 | { |
280 | - $this->app['events']->dispatch(sprintf('modules.%s.' . $event, $this->getLowerName()), [$this]); |
|
280 | + $this->app['events']->dispatch(sprintf('modules.%s.'.$event, $this->getLowerName()), [$this]); |
|
281 | 281 | } |
282 | 282 | /** |
283 | 283 | * Register the aliases from this module. |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | protected function registerFiles(): void |
303 | 303 | { |
304 | 304 | foreach ($this->get('files', []) as $file) { |
305 | - include $this->path . '/' . $file; |
|
305 | + include $this->path.'/'.$file; |
|
306 | 306 | } |
307 | 307 | } |
308 | 308 | |
@@ -407,7 +407,7 @@ discard block |
||
407 | 407 | */ |
408 | 408 | public function getExtraPath(string $path) : string |
409 | 409 | { |
410 | - return $this->getPath() . '/' . $path; |
|
410 | + return $this->getPath().'/'.$path; |
|
411 | 411 | } |
412 | 412 | |
413 | 413 | /** |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | */ |
32 | 32 | public function setupStubPath() |
33 | 33 | { |
34 | - Stub::setBasePath(__DIR__ . '/Commands/stubs'); |
|
34 | + Stub::setBasePath(__DIR__.'/Commands/stubs'); |
|
35 | 35 | |
36 | 36 | if (app('modules')->config('stubs.enabled') === true) { |
37 | 37 | Stub::setBasePath(app('modules')->config('stubs.path')); |
@@ -43,14 +43,14 @@ discard block |
||
43 | 43 | */ |
44 | 44 | protected function registerServices() |
45 | 45 | { |
46 | - $this->app->singleton(Contracts\RepositoryInterface::class, function ($app) { |
|
46 | + $this->app->singleton(Contracts\RepositoryInterface::class, function($app) { |
|
47 | 47 | $path = $app['config']->get('modules.paths.modules'); |
48 | 48 | |
49 | 49 | return new Lumen\LumenFileRepository($app, $path); |
50 | 50 | }); |
51 | - $this->app->singleton(Contracts\ActivatorInterface::class, function ($app) { |
|
51 | + $this->app->singleton(Contracts\ActivatorInterface::class, function($app) { |
|
52 | 52 | $activator = $app['config']->get('modules.activator'); |
53 | - $class = $app['config']->get('modules.activators.' . $activator)['class']; |
|
53 | + $class = $app['config']->get('modules.activators.'.$activator)['class']; |
|
54 | 54 | |
55 | 55 | return new $class($app); |
56 | 56 | }); |