@@ -46,7 +46,7 @@ |
||
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | foreach ($this->module->getOrdered($this->option('direction')) as $module) { |
| 49 | - $this->line('Running for module: <info>' . $module->getName() . '</info>'); |
|
| 49 | + $this->line('Running for module: <info>'.$module->getName().'</info>'); |
|
| 50 | 50 | $this->migrateStatus($module); |
| 51 | 51 | } |
| 52 | 52 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if (! function_exists('module_path')) { |
|
| 3 | +if (!function_exists('module_path')) { |
|
| 4 | 4 | function module_path($name) |
| 5 | 5 | { |
| 6 | 6 | $module = app('modules')->find($name); |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | } |
| 10 | 10 | } |
| 11 | 11 | |
| 12 | -if (! function_exists('config_path')) { |
|
| 12 | +if (!function_exists('config_path')) { |
|
| 13 | 13 | /** |
| 14 | 14 | * Get the configuration path. |
| 15 | 15 | * |
@@ -18,11 +18,11 @@ discard block |
||
| 18 | 18 | */ |
| 19 | 19 | function config_path($path = '') |
| 20 | 20 | { |
| 21 | - return app()->basePath() . '/config' . ($path ? '/' . $path : $path); |
|
| 21 | + return app()->basePath().'/config'.($path ? '/'.$path : $path); |
|
| 22 | 22 | } |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | -if (! function_exists('public_path')) { |
|
| 25 | +if (!function_exists('public_path')) { |
|
| 26 | 26 | /** |
| 27 | 27 | * Get the path to the public folder. |
| 28 | 28 | * |
@@ -31,6 +31,6 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | function public_path($path = '') |
| 33 | 33 | { |
| 34 | - return app()->make('path.public') . ($path ? DIRECTORY_SEPARATOR . ltrim($path, DIRECTORY_SEPARATOR) : $path); |
|
| 34 | + return app()->make('path.public').($path ? DIRECTORY_SEPARATOR . ltrim($path, DIRECTORY_SEPARATOR) : $path); |
|
| 35 | 35 | } |
| 36 | 36 | } |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | */ |
| 25 | 25 | public function toArray() |
| 26 | 26 | { |
| 27 | - return array_map(function ($value) { |
|
| 27 | + return array_map(function($value) { |
|
| 28 | 28 | if ($value instanceof Module) { |
| 29 | 29 | $attributes = $value->json()->getAttributes(); |
| 30 | 30 | $attributes["path"] = $value->getPath(); |
@@ -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 | /** |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | continue; |
| 284 | 284 | } |
| 285 | 285 | |
| 286 | - $path = $this->module->getModulePath($this->getName()) . '/' . $folder->getPath(); |
|
| 286 | + $path = $this->module->getModulePath($this->getName()).'/'.$folder->getPath(); |
|
| 287 | 287 | |
| 288 | 288 | $this->filesystem->makeDirectory($path, 0755, true); |
| 289 | 289 | if (config('modules.stubs.gitkeep')) { |
@@ -299,7 +299,7 @@ discard block |
||
| 299 | 299 | */ |
| 300 | 300 | public function generateGitKeep($path) |
| 301 | 301 | { |
| 302 | - $this->filesystem->put($path . '/.gitkeep', ''); |
|
| 302 | + $this->filesystem->put($path.'/.gitkeep', ''); |
|
| 303 | 303 | } |
| 304 | 304 | |
| 305 | 305 | /** |
@@ -308,7 +308,7 @@ discard block |
||
| 308 | 308 | public function generateFiles() |
| 309 | 309 | { |
| 310 | 310 | foreach ($this->getFiles() as $stub => $file) { |
| 311 | - $path = $this->module->getModulePath($this->getName()) . $file; |
|
| 311 | + $path = $this->module->getModulePath($this->getName()).$file; |
|
| 312 | 312 | |
| 313 | 313 | if (!$this->filesystem->isDirectory($dir = dirname($path))) { |
| 314 | 314 | $this->filesystem->makeDirectory($dir, 0775, true); |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | ]); |
| 333 | 333 | |
| 334 | 334 | $this->console->call('module:make-provider', [ |
| 335 | - 'name' => $this->getName() . 'ServiceProvider', |
|
| 335 | + 'name' => $this->getName().'ServiceProvider', |
|
| 336 | 336 | 'module' => $this->getName(), |
| 337 | 337 | '--master' => true, |
| 338 | 338 | ]); |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | ]); |
| 343 | 343 | |
| 344 | 344 | $this->console->call('module:make-controller', [ |
| 345 | - 'controller' => $this->getName() . 'Controller', |
|
| 345 | + 'controller' => $this->getName().'Controller', |
|
| 346 | 346 | 'module' => $this->getName(), |
| 347 | 347 | ]); |
| 348 | 348 | } |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | protected function getStubContents($stub) |
| 358 | 358 | { |
| 359 | 359 | return (new Stub( |
| 360 | - '/' . $stub . '.stub', |
|
| 360 | + '/'.$stub.'.stub', |
|
| 361 | 361 | $this->getReplacement($stub) |
| 362 | 362 | ) |
| 363 | 363 | )->render(); |
@@ -391,7 +391,7 @@ discard block |
||
| 391 | 391 | $replaces = []; |
| 392 | 392 | |
| 393 | 393 | foreach ($keys as $key) { |
| 394 | - if (method_exists($this, $method = 'get' . ucfirst(studly_case(strtolower($key))) . 'Replacement')) { |
|
| 394 | + if (method_exists($this, $method = 'get'.ucfirst(studly_case(strtolower($key))).'Replacement')) { |
|
| 395 | 395 | $replaces[$key] = $this->$method(); |
| 396 | 396 | } else { |
| 397 | 397 | $replaces[$key] = null; |
@@ -406,7 +406,7 @@ discard block |
||
| 406 | 406 | */ |
| 407 | 407 | private function generateModuleJsonFile() |
| 408 | 408 | { |
| 409 | - $path = $this->module->getModulePath($this->getName()) . 'module.json'; |
|
| 409 | + $path = $this->module->getModulePath($this->getName()).'module.json'; |
|
| 410 | 410 | |
| 411 | 411 | if (!$this->filesystem->isDirectory($dir = dirname($path))) { |
| 412 | 412 | $this->filesystem->makeDirectory($dir, 0775, true); |
@@ -423,13 +423,13 @@ discard block |
||
| 423 | 423 | */ |
| 424 | 424 | private function cleanModuleJsonFile() |
| 425 | 425 | { |
| 426 | - $path = $this->module->getModulePath($this->getName()) . 'module.json'; |
|
| 426 | + $path = $this->module->getModulePath($this->getName()).'module.json'; |
|
| 427 | 427 | |
| 428 | 428 | $content = $this->filesystem->get($path); |
| 429 | 429 | $namespace = $this->getModuleNamespaceReplacement(); |
| 430 | 430 | $studlyName = $this->getStudlyNameReplacement(); |
| 431 | 431 | |
| 432 | - $provider = '"' . $namespace . '\\\\' . $studlyName . '\\\\Providers\\\\' . $studlyName . 'ServiceProvider"'; |
|
| 432 | + $provider = '"'.$namespace.'\\\\'.$studlyName.'\\\\Providers\\\\'.$studlyName.'ServiceProvider"'; |
|
| 433 | 433 | |
| 434 | 434 | $content = str_replace($provider, '', $content); |
| 435 | 435 | |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | |
| 87 | 87 | $seederPath = GenerateConfigReader::read('seeder'); |
| 88 | 88 | |
| 89 | - return $path . $seederPath->getPath() . '/' . $this->getSeederName() . '.php'; |
|
| 89 | + return $path.$seederPath->getPath().'/'.$this->getSeederName().'.php'; |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | /** |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | { |
| 99 | 99 | $end = $this->option('master') ? 'DatabaseSeeder' : 'TableSeeder'; |
| 100 | 100 | |
| 101 | - return Str::studly($this->argument('name')) . $end; |
|
| 101 | + return Str::studly($this->argument('name')).$end; |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | /** |
@@ -103,7 +103,6 @@ discard block |
||
| 103 | 103 | /** |
| 104 | 104 | * Creates a new Module instance |
| 105 | 105 | * |
| 106 | - * @param Container $app |
|
| 107 | 106 | * @param $name |
| 108 | 107 | * @param $path |
| 109 | 108 | * @return \Nwidart\Modules\Module |
@@ -425,7 +424,7 @@ discard block |
||
| 425 | 424 | /** |
| 426 | 425 | * Get a specific config data from a configuration file. |
| 427 | 426 | * |
| 428 | - * @param $key |
|
| 427 | + * @param string $key |
|
| 429 | 428 | * |
| 430 | 429 | * @param null $default |
| 431 | 430 | * @return mixed |
@@ -614,7 +613,7 @@ discard block |
||
| 614 | 613 | /** |
| 615 | 614 | * Get stub path. |
| 616 | 615 | * |
| 617 | - * @return string|null |
|
| 616 | + * @return string|boolean |
|
| 618 | 617 | */ |
| 619 | 618 | public function getStubPath() |
| 620 | 619 | { |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | $paths = array_merge($paths, $this->config('scan.paths')); |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | - $paths = array_map(function ($path) { |
|
| 109 | + $paths = array_map(function($path) { |
|
| 110 | 110 | return ends_with($path, '/*') ? $path : str_finish($path, '/*'); |
| 111 | 111 | }, $paths); |
| 112 | 112 | |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | */ |
| 191 | 191 | public function getCached() |
| 192 | 192 | { |
| 193 | - return $this->app['cache']->remember($this->config('cache.key'), $this->config('cache.lifetime'), function () { |
|
| 193 | + return $this->app['cache']->remember($this->config('cache.key'), $this->config('cache.lifetime'), function() { |
|
| 194 | 194 | return $this->toCollection()->toArray(); |
| 195 | 195 | }); |
| 196 | 196 | } |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | { |
| 279 | 279 | $modules = $this->allEnabled(); |
| 280 | 280 | |
| 281 | - uasort($modules, function (Module $a, Module $b) use ($direction) { |
|
| 281 | + uasort($modules, function(Module $a, Module $b) use ($direction) { |
|
| 282 | 282 | if ($a->order == $b->order) { |
| 283 | 283 | return 0; |
| 284 | 284 | } |
@@ -428,9 +428,9 @@ discard block |
||
| 428 | 428 | public function getModulePath($module) |
| 429 | 429 | { |
| 430 | 430 | try { |
| 431 | - return $this->findOrFail($module)->getPath() . '/'; |
|
| 431 | + return $this->findOrFail($module)->getPath().'/'; |
|
| 432 | 432 | } catch (ModuleNotFoundException $e) { |
| 433 | - return $this->getPath() . '/' . Str::studly($module) . '/'; |
|
| 433 | + return $this->getPath().'/'.Str::studly($module).'/'; |
|
| 434 | 434 | } |
| 435 | 435 | } |
| 436 | 436 | |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | */ |
| 444 | 444 | public function assetPath($module) : string |
| 445 | 445 | { |
| 446 | - return $this->config('paths.assets') . '/' . $module; |
|
| 446 | + return $this->config('paths.assets').'/'.$module; |
|
| 447 | 447 | } |
| 448 | 448 | |
| 449 | 449 | /** |
@@ -456,7 +456,7 @@ discard block |
||
| 456 | 456 | */ |
| 457 | 457 | public function config($key, $default = null) |
| 458 | 458 | { |
| 459 | - return $this->app['config']->get('modules.' . $key, $default); |
|
| 459 | + return $this->app['config']->get('modules.'.$key, $default); |
|
| 460 | 460 | } |
| 461 | 461 | |
| 462 | 462 | /** |
@@ -557,9 +557,9 @@ discard block |
||
| 557 | 557 | } |
| 558 | 558 | list($name, $url) = explode(':', $asset); |
| 559 | 559 | |
| 560 | - $baseUrl = str_replace(public_path() . DIRECTORY_SEPARATOR, '', $this->getAssetsPath()); |
|
| 560 | + $baseUrl = str_replace(public_path().DIRECTORY_SEPARATOR, '', $this->getAssetsPath()); |
|
| 561 | 561 | |
| 562 | - $url = $this->app['url']->asset($baseUrl . "/{$name}/" . $url); |
|
| 562 | + $url = $this->app['url']->asset($baseUrl."/{$name}/".$url); |
|
| 563 | 563 | |
| 564 | 564 | return str_replace(['http://', 'https://'], '//', $url); |
| 565 | 565 | } |
@@ -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 | |
@@ -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 | /** |