@@ -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 | { |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | $paths = array_merge($paths, $this->config('scan.paths')); |
94 | 94 | } |
95 | 95 | |
96 | - $paths = array_map(function ($path) { |
|
96 | + $paths = array_map(function($path) { |
|
97 | 97 | return Str::endsWith($path, '/*') ? $path : Str::finish($path, '/*'); |
98 | 98 | }, $paths); |
99 | 99 | |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | */ |
178 | 178 | public function getCached() |
179 | 179 | { |
180 | - return $this->app['cache']->remember($this->config('cache.key'), $this->config('cache.lifetime'), function () { |
|
180 | + return $this->app['cache']->remember($this->config('cache.key'), $this->config('cache.lifetime'), function() { |
|
181 | 181 | return $this->toCollection()->toArray(); |
182 | 182 | }); |
183 | 183 | } |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | { |
266 | 266 | $modules = $this->allEnabled(); |
267 | 267 | |
268 | - uasort($modules, function (Module $a, Module $b) use ($direction) { |
|
268 | + uasort($modules, function(Module $a, Module $b) use ($direction) { |
|
269 | 269 | if ($a->order == $b->order) { |
270 | 270 | return 0; |
271 | 271 | } |
@@ -404,9 +404,9 @@ discard block |
||
404 | 404 | public function getModulePath($module) |
405 | 405 | { |
406 | 406 | try { |
407 | - return $this->findOrFail($module)->getPath() . '/'; |
|
407 | + return $this->findOrFail($module)->getPath().'/'; |
|
408 | 408 | } catch (ModuleNotFoundException $e) { |
409 | - return $this->getPath() . '/' . Str::studly($module) . '/'; |
|
409 | + return $this->getPath().'/'.Str::studly($module).'/'; |
|
410 | 410 | } |
411 | 411 | } |
412 | 412 | |
@@ -419,7 +419,7 @@ discard block |
||
419 | 419 | */ |
420 | 420 | public function assetPath($module) : string |
421 | 421 | { |
422 | - return $this->config('paths.assets') . '/' . $module; |
|
422 | + return $this->config('paths.assets').'/'.$module; |
|
423 | 423 | } |
424 | 424 | |
425 | 425 | /** |
@@ -432,7 +432,7 @@ discard block |
||
432 | 432 | */ |
433 | 433 | public function config($key, $default = null) |
434 | 434 | { |
435 | - return $this->app['config']->get('modules.' . $key, $default); |
|
435 | + return $this->app['config']->get('modules.'.$key, $default); |
|
436 | 436 | } |
437 | 437 | |
438 | 438 | /** |
@@ -522,9 +522,9 @@ discard block |
||
522 | 522 | } |
523 | 523 | list($name, $url) = explode(':', $asset); |
524 | 524 | |
525 | - $baseUrl = str_replace(public_path() . DIRECTORY_SEPARATOR, '', $this->getAssetsPath()); |
|
525 | + $baseUrl = str_replace(public_path().DIRECTORY_SEPARATOR, '', $this->getAssetsPath()); |
|
526 | 526 | |
527 | - $url = $this->app['url']->asset($baseUrl . "/{$name}/" . $url); |
|
527 | + $url = $this->app['url']->asset($baseUrl."/{$name}/".$url); |
|
528 | 528 | |
529 | 529 | return str_replace(['http://', 'https://'], '//', $url); |
530 | 530 | } |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | */ |
147 | 147 | public function createField($column, $attributes, $type = 'add') |
148 | 148 | { |
149 | - $results = "\t\t\t" . '$table'; |
|
149 | + $results = "\t\t\t".'$table'; |
|
150 | 150 | |
151 | 151 | foreach ($attributes as $key => $field) { |
152 | 152 | if (in_array($column, $this->relationshipKeys)) { |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | } |
157 | 157 | } |
158 | 158 | |
159 | - return $results . ';' . PHP_EOL; |
|
159 | + return $results.';'.PHP_EOL; |
|
160 | 160 | } |
161 | 161 | |
162 | 162 | /** |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | */ |
171 | 171 | protected function addRelationColumn($key, $field, $column) |
172 | 172 | { |
173 | - $relatedColumn = Str::snake(class_basename($field)) . '_id'; |
|
173 | + $relatedColumn = Str::snake(class_basename($field)).'_id'; |
|
174 | 174 | |
175 | 175 | $method = 'integer'; |
176 | 176 | |
@@ -189,18 +189,18 @@ discard block |
||
189 | 189 | protected function addColumn($key, $field, $column) |
190 | 190 | { |
191 | 191 | if ($this->hasCustomAttribute($column)) { |
192 | - return '->' . $field; |
|
192 | + return '->'.$field; |
|
193 | 193 | } |
194 | 194 | |
195 | 195 | if ($key == 0) { |
196 | - return '->' . $field . "('" . $column . "')"; |
|
196 | + return '->'.$field."('".$column."')"; |
|
197 | 197 | } |
198 | 198 | |
199 | 199 | if (Str::contains($field, '(')) { |
200 | - return '->' . $field; |
|
200 | + return '->'.$field; |
|
201 | 201 | } |
202 | 202 | |
203 | - return '->' . $field . '()'; |
|
203 | + return '->'.$field.'()'; |
|
204 | 204 | } |
205 | 205 | |
206 | 206 | /** |
@@ -215,10 +215,10 @@ discard block |
||
215 | 215 | protected function removeColumn($key, $field, $column) |
216 | 216 | { |
217 | 217 | if ($this->hasCustomAttribute($column)) { |
218 | - return '->' . $field; |
|
218 | + return '->'.$field; |
|
219 | 219 | } |
220 | 220 | |
221 | - return '->dropColumn(' . "'" . $column . "')"; |
|
221 | + return '->dropColumn('."'".$column."')"; |
|
222 | 222 | } |
223 | 223 | |
224 | 224 | /** |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | */ |
244 | 244 | public function getAttributes($column, $schema) |
245 | 245 | { |
246 | - $fields = str_replace($column . ':', '', $schema); |
|
246 | + $fields = str_replace($column.':', '', $schema); |
|
247 | 247 | |
248 | 248 | return $this->hasCustomAttribute($column) ? $this->getCustomAttribute($column) : explode(':', $fields); |
249 | 249 | } |
@@ -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 |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | { |
192 | 192 | $lowerName = $this->getLowerName(); |
193 | 193 | |
194 | - $langPath = $this->getPath() . '/Resources/lang'; |
|
194 | + $langPath = $this->getPath().'/Resources/lang'; |
|
195 | 195 | |
196 | 196 | if (is_dir($langPath)) { |
197 | 197 | $this->loadTranslationsFrom($langPath, $lowerName); |
@@ -211,8 +211,8 @@ discard block |
||
211 | 211 | $file = 'module.json'; |
212 | 212 | } |
213 | 213 | |
214 | - return Arr::get($this->moduleJson, $file, function () use ($file) { |
|
215 | - return $this->moduleJson[$file] = new Json($this->getPath() . '/' . $file, $this->app['files']); |
|
214 | + return Arr::get($this->moduleJson, $file, function() use ($file) { |
|
215 | + return $this->moduleJson[$file] = new Json($this->getPath().'/'.$file, $this->app['files']); |
|
216 | 216 | }); |
217 | 217 | } |
218 | 218 | |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | */ |
266 | 266 | protected function fireEvent($event) |
267 | 267 | { |
268 | - $this->app['events']->dispatch(sprintf('modules.%s.' . $event, $this->getLowerName()), [$this]); |
|
268 | + $this->app['events']->dispatch(sprintf('modules.%s.'.$event, $this->getLowerName()), [$this]); |
|
269 | 269 | } |
270 | 270 | /** |
271 | 271 | * Register the aliases from this module. |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | protected function registerFiles() |
291 | 291 | { |
292 | 292 | foreach ($this->get('files', []) as $file) { |
293 | - include $this->path . '/' . $file; |
|
293 | + include $this->path.'/'.$file; |
|
294 | 294 | } |
295 | 295 | } |
296 | 296 | |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | */ |
392 | 392 | public function getExtraPath(string $path) : string |
393 | 393 | { |
394 | - return $this->getPath() . '/' . $path; |
|
394 | + return $this->getPath().'/'.$path; |
|
395 | 395 | } |
396 | 396 | |
397 | 397 | /** |