@@ -14,7 +14,7 @@ |
||
| 14 | 14 | */ |
| 15 | 15 | public function getCachedServicesPath() |
| 16 | 16 | { |
| 17 | - return Str::replaceLast('services.php', $this->getSnakeName() . '_module.php', $this->app->getCachedServicesPath()); |
|
| 17 | + return Str::replaceLast('services.php', $this->getSnakeName().'_module.php', $this->app->getCachedServicesPath()); |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | /** |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function getCachedServicesPath() |
| 14 | 14 | { |
| 15 | - return Str::replaceLast('services.php', $this->getSnakeName() . '_module.php', $this->app->basePath('storage/app/') . 'services.php'); |
|
| 15 | + return Str::replaceLast('services.php', $this->getSnakeName().'_module.php', $this->app->basePath('storage/app/').'services.php'); |
|
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | /** |
@@ -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 | } |
@@ -30,9 +30,9 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function setupStubPath() |
| 32 | 32 | { |
| 33 | - Stub::setBasePath(__DIR__ . '/Commands/stubs'); |
|
| 33 | + Stub::setBasePath(__DIR__.'/Commands/stubs'); |
|
| 34 | 34 | |
| 35 | - $this->app->booted(function ($app) { |
|
| 35 | + $this->app->booted(function($app) { |
|
| 36 | 36 | if ($app['modules']->config('stubs.enabled') === true) { |
| 37 | 37 | Stub::setBasePath($app['modules']->config('stubs.path')); |
| 38 | 38 | } |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | */ |
| 45 | 45 | protected function registerServices() |
| 46 | 46 | { |
| 47 | - $this->app->singleton('modules', function ($app) { |
|
| 47 | + $this->app->singleton('modules', function($app) { |
|
| 48 | 48 | $path = $app['config']->get('modules.paths.modules'); |
| 49 | 49 | |
| 50 | 50 | return new \Nwidart\Modules\Laravel\Repository($app, $path); |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function setupStubPath() |
| 32 | 32 | { |
| 33 | - Stub::setBasePath(__DIR__ . '/Commands/stubs'); |
|
| 33 | + Stub::setBasePath(__DIR__.'/Commands/stubs'); |
|
| 34 | 34 | |
| 35 | 35 | if (app('modules')->config('stubs.enabled') === true) { |
| 36 | 36 | Stub::setBasePath(app('modules')->config('stubs.path')); |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | protected function registerServices() |
| 44 | 44 | { |
| 45 | - $this->app->singleton('modules', function ($app) { |
|
| 45 | + $this->app->singleton('modules', function($app) { |
|
| 46 | 46 | $path = $app['config']->get('modules.paths.modules'); |
| 47 | 47 | |
| 48 | 48 | return new \Nwidart\Modules\Lumen\Repository($app, $path); |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | */ |
| 44 | 44 | protected function registerNamespaces() |
| 45 | 45 | { |
| 46 | - $configPath = __DIR__ . '/../config/config.php'; |
|
| 46 | + $configPath = __DIR__.'/../config/config.php'; |
|
| 47 | 47 | |
| 48 | 48 | $this->mergeConfigFrom($configPath, 'modules'); |
| 49 | 49 | $this->publishes([ |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | $modules = []; |
| 40 | 40 | |
| 41 | 41 | foreach ($cached as $name => $module) { |
| 42 | - $path = $this->config('paths.modules') . '/' . $name; |
|
| 42 | + $path = $this->config('paths.modules').'/'.$name; |
|
| 43 | 43 | |
| 44 | 44 | $modules[$name] = new Module($this->app, $name, $path); |
| 45 | 45 | } |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | return; |
| 281 | 281 | } |
| 282 | 282 | |
| 283 | - $path = $this->module->getModulePath($this->getName()) . '/' . $folder; |
|
| 283 | + $path = $this->module->getModulePath($this->getName()).'/'.$folder; |
|
| 284 | 284 | |
| 285 | 285 | $this->filesystem->makeDirectory($path, 0755, true); |
| 286 | 286 | |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | */ |
| 296 | 296 | public function generateGitKeep($path) |
| 297 | 297 | { |
| 298 | - $this->filesystem->put($path . '/.gitkeep', ''); |
|
| 298 | + $this->filesystem->put($path.'/.gitkeep', ''); |
|
| 299 | 299 | } |
| 300 | 300 | |
| 301 | 301 | /** |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | public function generateFiles() |
| 305 | 305 | { |
| 306 | 306 | foreach ($this->getFiles() as $stub => $file) { |
| 307 | - $path = $this->module->getModulePath($this->getName()) . $file; |
|
| 307 | + $path = $this->module->getModulePath($this->getName()).$file; |
|
| 308 | 308 | |
| 309 | 309 | if (!$this->filesystem->isDirectory($dir = dirname($path))) { |
| 310 | 310 | $this->filesystem->makeDirectory($dir, 0775, true); |
@@ -328,13 +328,13 @@ discard block |
||
| 328 | 328 | ]); |
| 329 | 329 | |
| 330 | 330 | $this->console->call('module:make-provider', [ |
| 331 | - 'name' => $this->getName() . 'ServiceProvider', |
|
| 331 | + 'name' => $this->getName().'ServiceProvider', |
|
| 332 | 332 | 'module' => $this->getName(), |
| 333 | 333 | '--master' => true, |
| 334 | 334 | ]); |
| 335 | 335 | |
| 336 | 336 | $this->console->call('module:make-controller', [ |
| 337 | - 'controller' => $this->getName() . 'Controller', |
|
| 337 | + 'controller' => $this->getName().'Controller', |
|
| 338 | 338 | 'module' => $this->getName(), |
| 339 | 339 | ]); |
| 340 | 340 | } |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | protected function getStubContents($stub) |
| 350 | 350 | { |
| 351 | 351 | return (new Stub( |
| 352 | - '/' . $stub . '.stub', |
|
| 352 | + '/'.$stub.'.stub', |
|
| 353 | 353 | $this->getReplacement($stub) |
| 354 | 354 | ) |
| 355 | 355 | )->render(); |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | $replaces = []; |
| 384 | 384 | |
| 385 | 385 | foreach ($keys as $key) { |
| 386 | - if (method_exists($this, $method = 'get' . ucfirst(studly_case(strtolower($key))) . 'Replacement')) { |
|
| 386 | + if (method_exists($this, $method = 'get'.ucfirst(studly_case(strtolower($key))).'Replacement')) { |
|
| 387 | 387 | $replaces[$key] = call_user_func([$this, $method]); |
| 388 | 388 | } else { |
| 389 | 389 | $replaces[$key] = null; |
@@ -398,7 +398,7 @@ discard block |
||
| 398 | 398 | */ |
| 399 | 399 | private function generateModuleJsonFile() |
| 400 | 400 | { |
| 401 | - $path = $this->module->getModulePath($this->getName()) . 'module.json'; |
|
| 401 | + $path = $this->module->getModulePath($this->getName()).'module.json'; |
|
| 402 | 402 | |
| 403 | 403 | if (!$this->filesystem->isDirectory($dir = dirname($path))) { |
| 404 | 404 | $this->filesystem->makeDirectory($dir, 0775, true); |
@@ -415,13 +415,13 @@ discard block |
||
| 415 | 415 | */ |
| 416 | 416 | private function cleanModuleJsonFile() |
| 417 | 417 | { |
| 418 | - $path = $this->module->getModulePath($this->getName()) . 'module.json'; |
|
| 418 | + $path = $this->module->getModulePath($this->getName()).'module.json'; |
|
| 419 | 419 | |
| 420 | 420 | $content = $this->filesystem->get($path); |
| 421 | 421 | $namespace = $this->getModuleNamespaceReplacement(); |
| 422 | 422 | $studlyName = $this->getStudlyNameReplacement(); |
| 423 | 423 | |
| 424 | - $provider = '"' . $namespace . '\\\\' . $studlyName . '\\\\Providers\\\\' . $studlyName . 'ServiceProvider"'; |
|
| 424 | + $provider = '"'.$namespace.'\\\\'.$studlyName.'\\\\Providers\\\\'.$studlyName.'ServiceProvider"'; |
|
| 425 | 425 | |
| 426 | 426 | $content = str_replace($provider, '', $content); |
| 427 | 427 | |
@@ -67,7 +67,7 @@ |
||
| 67 | 67 | |
| 68 | 68 | $policyPath = $this->laravel['modules']->config('paths.generator.policies'); |
| 69 | 69 | |
| 70 | - return $path . $policyPath . '/' . $this->getFileName() . '.php'; |
|
| 70 | + return $path.$policyPath.'/'.$this->getFileName().'.php'; |
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | /** |