@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | { |
198 | 198 | $lowerName = $this->getLowerName(); |
199 | 199 | |
200 | - $langPath = $this->getPath() . '/Resources/lang'; |
|
200 | + $langPath = $this->getPath().'/Resources/lang'; |
|
201 | 201 | |
202 | 202 | if (is_dir($langPath)) { |
203 | 203 | $this->loadTranslationsFrom($langPath, $lowerName); |
@@ -217,8 +217,8 @@ discard block |
||
217 | 217 | $file = 'module.json'; |
218 | 218 | } |
219 | 219 | |
220 | - return Arr::get($this->moduleJson, $file, function () use ($file) { |
|
221 | - return $this->moduleJson[$file] = new Json($this->getPath() . '/' . $file, $this->files); |
|
220 | + return Arr::get($this->moduleJson, $file, function() use ($file) { |
|
221 | + return $this->moduleJson[$file] = new Json($this->getPath().'/'.$file, $this->files); |
|
222 | 222 | }); |
223 | 223 | } |
224 | 224 | |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | */ |
272 | 272 | protected function fireEvent($event) |
273 | 273 | { |
274 | - $this->app['events']->dispatch(sprintf('modules.%s.' . $event, $this->getLowerName()), [$this]); |
|
274 | + $this->app['events']->dispatch(sprintf('modules.%s.'.$event, $this->getLowerName()), [$this]); |
|
275 | 275 | } |
276 | 276 | /** |
277 | 277 | * Register the aliases from this module. |
@@ -296,7 +296,7 @@ discard block |
||
296 | 296 | protected function registerFiles() |
297 | 297 | { |
298 | 298 | foreach ($this->get('files', []) as $file) { |
299 | - include $this->path . '/' . $file; |
|
299 | + include $this->path.'/'.$file; |
|
300 | 300 | } |
301 | 301 | } |
302 | 302 | |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | */ |
400 | 400 | public function getExtraPath(string $path) : string |
401 | 401 | { |
402 | - return $this->getPath() . '/' . $path; |
|
402 | + return $this->getPath().'/'.$path; |
|
403 | 403 | } |
404 | 404 | |
405 | 405 | /** |
@@ -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 |
@@ -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 | } |
@@ -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->order == $b->order) { |
293 | 293 | return 0; |
294 | 294 | } |
@@ -427,9 +427,9 @@ discard block |
||
427 | 427 | public function getModulePath($module) |
428 | 428 | { |
429 | 429 | try { |
430 | - return $this->findOrFail($module)->getPath() . '/'; |
|
430 | + return $this->findOrFail($module)->getPath().'/'; |
|
431 | 431 | } catch (ModuleNotFoundException $e) { |
432 | - return $this->getPath() . '/' . Str::studly($module) . '/'; |
|
432 | + return $this->getPath().'/'.Str::studly($module).'/'; |
|
433 | 433 | } |
434 | 434 | } |
435 | 435 | |
@@ -442,7 +442,7 @@ discard block |
||
442 | 442 | */ |
443 | 443 | public function assetPath($module) : string |
444 | 444 | { |
445 | - return $this->config('paths.assets') . '/' . $module; |
|
445 | + return $this->config('paths.assets').'/'.$module; |
|
446 | 446 | } |
447 | 447 | |
448 | 448 | /** |
@@ -450,7 +450,7 @@ discard block |
||
450 | 450 | */ |
451 | 451 | public function config(string $key, $default = null) |
452 | 452 | { |
453 | - return $this->config->get('modules.' . $key, $default); |
|
453 | + return $this->config->get('modules.'.$key, $default); |
|
454 | 454 | } |
455 | 455 | |
456 | 456 | /** |
@@ -540,9 +540,9 @@ discard block |
||
540 | 540 | } |
541 | 541 | list($name, $url) = explode(':', $asset); |
542 | 542 | |
543 | - $baseUrl = str_replace(public_path() . DIRECTORY_SEPARATOR, '', $this->getAssetsPath()); |
|
543 | + $baseUrl = str_replace(public_path().DIRECTORY_SEPARATOR, '', $this->getAssetsPath()); |
|
544 | 544 | |
545 | - $url = $this->url->asset($baseUrl . "/{$name}/" . $url); |
|
545 | + $url = $this->url->asset($baseUrl."/{$name}/".$url); |
|
546 | 546 | |
547 | 547 | return str_replace(['http://', 'https://'], '//', $url); |
548 | 548 | } |
@@ -31,9 +31,9 @@ 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 | - $this->app->booted(function ($app) { |
|
36 | + $this->app->booted(function($app) { |
|
37 | 37 | /** @var RepositoryInterface $moduleRepository */ |
38 | 38 | $moduleRepository = $app[RepositoryInterface::class]; |
39 | 39 | if ($moduleRepository->config('stubs.enabled') === true) { |
@@ -47,14 +47,14 @@ discard block |
||
47 | 47 | */ |
48 | 48 | protected function registerServices() |
49 | 49 | { |
50 | - $this->app->singleton(Contracts\RepositoryInterface::class, function ($app) { |
|
50 | + $this->app->singleton(Contracts\RepositoryInterface::class, function($app) { |
|
51 | 51 | $path = $app['config']->get('modules.paths.modules'); |
52 | 52 | |
53 | 53 | return new Laravel\LaravelFileRepository($app, $path); |
54 | 54 | }); |
55 | - $this->app->singleton(Contracts\ActivatorInterface::class, function ($app) { |
|
55 | + $this->app->singleton(Contracts\ActivatorInterface::class, function($app) { |
|
56 | 56 | $activator = $app['config']->get('modules.activator'); |
57 | - $class = $app['config']->get('modules.activators.' . $activator)['class']; |
|
57 | + $class = $app['config']->get('modules.activators.'.$activator)['class']; |
|
58 | 58 | |
59 | 59 | return new $class($app); |
60 | 60 | }); |
@@ -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 | }); |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | return $this->readJson(); |
80 | 80 | } |
81 | 81 | |
82 | - return $this->cache->remember($this->cacheKey, $this->cacheLifetime, function () { |
|
82 | + return $this->cache->remember($this->cacheKey, $this->cacheLifetime, function() { |
|
83 | 83 | return $this->readJson(); |
84 | 84 | }); |
85 | 85 | } |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | */ |
102 | 102 | private function config(string $key, $default = null) |
103 | 103 | { |
104 | - return $this->config->get('modules.activators.file.' . $key, $default); |
|
104 | + return $this->config->get('modules.activators.file.'.$key, $default); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | /** |