Completed
Pull Request — master (#483)
by Nauris
03:12
created
src/Generators/ModuleGenerator.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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,13 +332,13 @@  discard block
 block discarded – undo
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
         ]);
339 339
 
340 340
         $this->console->call('module:make-controller', [
341
-            'controller' => $this->getName() . 'Controller',
341
+            'controller' => $this->getName().'Controller',
342 342
             'module' => $this->getName(),
343 343
         ]);
344 344
     }
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
353 353
     protected function getStubContents($stub)
354 354
     {
355 355
         return (new Stub(
356
-            '/' . $stub . '.stub',
356
+            '/'.$stub.'.stub',
357 357
             $this->getReplacement($stub)
358 358
         )
359 359
         )->render();
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
387 387
         $replaces = [];
388 388
 
389 389
         foreach ($keys as $key) {
390
-            if (method_exists($this, $method = 'get' . ucfirst(studly_case(strtolower($key))) . 'Replacement')) {
390
+            if (method_exists($this, $method = 'get'.ucfirst(studly_case(strtolower($key))).'Replacement')) {
391 391
                 $replaces[$key] = $this->$method();
392 392
             } else {
393 393
                 $replaces[$key] = null;
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
      */
403 403
     private function generateModuleJsonFile()
404 404
     {
405
-        $path = $this->module->getModulePath($this->getName()) . 'module.json';
405
+        $path = $this->module->getModulePath($this->getName()).'module.json';
406 406
 
407 407
         if (!$this->filesystem->isDirectory($dir = dirname($path))) {
408 408
             $this->filesystem->makeDirectory($dir, 0775, true);
@@ -419,13 +419,13 @@  discard block
 block discarded – undo
419 419
      */
420 420
     private function cleanModuleJsonFile()
421 421
     {
422
-        $path = $this->module->getModulePath($this->getName()) . 'module.json';
422
+        $path = $this->module->getModulePath($this->getName()).'module.json';
423 423
 
424 424
         $content = $this->filesystem->get($path);
425 425
         $namespace = $this->getModuleNamespaceReplacement();
426 426
         $studlyName = $this->getStudlyNameReplacement();
427 427
 
428
-        $provider = '"' . $namespace . '\\\\' . $studlyName . '\\\\Providers\\\\' . $studlyName . 'ServiceProvider"';
428
+        $provider = '"'.$namespace.'\\\\'.$studlyName.'\\\\Providers\\\\'.$studlyName.'ServiceProvider"';
429 429
 
430 430
         $content = str_replace($provider, '', $content);
431 431
 
@@ -494,6 +494,6 @@  discard block
 block discarded – undo
494 494
 
495 495
     protected function getRoutesLocationReplacement()
496 496
     {
497
-        return '/' . $this->module->config('stubs.files.routes');
497
+        return '/'.$this->module->config('stubs.files.routes');
498 498
     }
499 499
 }
Please login to merge, or discard this patch.
src/Collection.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
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();
Please login to merge, or discard this patch.
src/Laravel/Repository.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,6 @@
 block discarded – undo
2 2
 
3 3
 namespace Nwidart\Modules\Laravel;
4 4
 
5
-use Nwidart\Modules\Json;
6 5
 use Nwidart\Modules\Repository as BaseRepository;
7 6
 
8 7
 class Repository extends BaseRepository
Please login to merge, or discard this patch.
src/Lumen/Repository.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,6 @@
 block discarded – undo
2 2
 
3 3
 namespace Nwidart\Modules\Lumen;
4 4
 
5
-use Nwidart\Modules\Json;
6 5
 use Nwidart\Modules\Repository as BaseRepository;
7 6
 
8 7
 class Repository extends BaseRepository
Please login to merge, or discard this patch.
src/Support/Stub.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -71,9 +71,9 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     /**
Please login to merge, or discard this patch.
src/Repository.php 2 patches
Doc Comments   +4 added lines, -5 removed lines patch added patch discarded remove patch
@@ -116,7 +116,6 @@  discard block
 block discarded – undo
116 116
     /**
117 117
      * Creates a new Module instance
118 118
      *
119
-     * @param Container $app
120 119
      * @param $name
121 120
      * @param $path
122 121
      * @return \Nwidart\Modules\Module
@@ -421,7 +420,7 @@  discard block
 block discarded – undo
421 420
     /**
422 421
      * Get module path for a specific module.
423 422
      *
424
-     * @param $module
423
+     * @param string $module
425 424
      *
426 425
      * @return string
427 426
      */
@@ -449,9 +448,9 @@  discard block
 block discarded – undo
449 448
     /**
450 449
      * Get a specific config data from a configuration file.
451 450
      *
452
-     * @param $key
451
+     * @param string $key
453 452
      *
454
-     * @param null $default
453
+     * @param string $default
455 454
      * @return mixed
456 455
      */
457 456
     public function config($key, $default = null)
@@ -649,7 +648,7 @@  discard block
 block discarded – undo
649 648
     /**
650 649
      * Get stub path.
651 650
      *
652
-     * @return string|null
651
+     * @return string|boolean
653 652
      */
654 653
     public function getStubPath()
655 654
     {
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     }
Please login to merge, or discard this patch.