Completed
Pull Request — master (#1186)
by
unknown
22:52 queued 08:57
created
src/Support/Migrations/SchemaParser.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
156 156
             }
157 157
         }
158 158
 
159
-        return $results . ';' . PHP_EOL;
159
+        return $results.';'.PHP_EOL;
160 160
     }
161 161
 
162 162
     /**
@@ -171,9 +171,9 @@  discard block
 block discarded – undo
171 171
     protected function addRelationColumn($key, $field, $column)
172 172
     {
173 173
         if ($key === 0) {
174
-            $relatedColumn = Str::snake(class_basename($field)) . '_id';
174
+            $relatedColumn = Str::snake(class_basename($field)).'_id';
175 175
 
176
-            return "->integer('{$relatedColumn}')->unsigned();" . PHP_EOL . "\t\t\t" . "\$table->foreign('{$relatedColumn}')";
176
+            return "->integer('{$relatedColumn}')->unsigned();".PHP_EOL."\t\t\t"."\$table->foreign('{$relatedColumn}')";
177 177
         }
178 178
         if ($key === 1) {
179 179
             return "->references('{$field}')";
@@ -182,9 +182,9 @@  discard block
 block discarded – undo
182 182
             return "->on('{$field}')";
183 183
         }
184 184
         if (Str::contains($field, '(')) {
185
-            return '->' . $field;
185
+            return '->'.$field;
186 186
         }
187
-        return '->' . $field . '()';
187
+        return '->'.$field.'()';
188 188
     }
189 189
 
190 190
     /**
@@ -199,18 +199,18 @@  discard block
 block discarded – undo
199 199
     protected function addColumn($key, $field, $column)
200 200
     {
201 201
         if ($this->hasCustomAttribute($column)) {
202
-            return '->' . $field;
202
+            return '->'.$field;
203 203
         }
204 204
 
205 205
         if ($key == 0) {
206
-            return '->' . $field . "('" . $column . "')";
206
+            return '->'.$field."('".$column."')";
207 207
         }
208 208
 
209 209
         if (Str::contains($field, '(')) {
210
-            return '->' . $field;
210
+            return '->'.$field;
211 211
         }
212 212
 
213
-        return '->' . $field . '()';
213
+        return '->'.$field.'()';
214 214
     }
215 215
 
216 216
     /**
@@ -225,10 +225,10 @@  discard block
 block discarded – undo
225 225
     protected function removeColumn($key, $field, $column)
226 226
     {
227 227
         if ($this->hasCustomAttribute($column)) {
228
-            return '->' . $field;
228
+            return '->'.$field;
229 229
         }
230 230
 
231
-        return '->dropColumn(' . "'" . $column . "')";
231
+        return '->dropColumn('."'".$column."')";
232 232
     }
233 233
 
234 234
     /**
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
      */
254 254
     public function getAttributes($column, $schema)
255 255
     {
256
-        $fields = str_replace($column . ':', '', $schema);
256
+        $fields = str_replace($column.':', '', $schema);
257 257
 
258 258
         return $this->hasCustomAttribute($column) ? $this->getCustomAttribute($column) : explode(':', $fields);
259 259
     }
Please login to merge, or discard this patch.
src/Commands/SeedCommand.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
         $name = $module->getName();
104 104
         $config = $module->get('migration');
105 105
         if (is_array($config) && array_key_exists('seeds', $config)) {
106
-            foreach ((array)$config['seeds'] as $class) {
106
+            foreach ((array) $config['seeds'] as $class) {
107 107
                 if (class_exists($class)) {
108 108
                     $seeders[] = $class;
109 109
                 }
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
     protected function dbSeed($className)
138 138
     {
139 139
         if ($option = $this->option('class')) {
140
-            $params['--class'] = Str::finish(substr($className, 0, strrpos($className, '\\')), '\\') . $option;
140
+            $params['--class'] = Str::finish(substr($className, 0, strrpos($className, '\\')), '\\').$option;
141 141
         } else {
142 142
             $params = ['--class' => $className];
143 143
         }
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
         $config = GenerateConfigReader::read('seeder');
169 169
         $seederPath = str_replace('/', '\\', $config->getPath());
170 170
 
171
-        return $namespace . '\\' . $name . '\\' . $seederPath . '\\' . $name . 'DatabaseSeeder';
171
+        return $namespace.'\\'.$name.'\\'.$seederPath.'\\'.$name.'DatabaseSeeder';
172 172
     }
173 173
 
174 174
     /**
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
         $foundModules = [];
189 189
         foreach ($this->laravel['modules']->config('scan.paths') as $path) {
190 190
             $namespace = array_slice(explode('/', $path), -1)[0];
191
-            $foundModules[] = $namespace . '\\' . $name . '\\' . $seederPath . '\\' . $name . 'DatabaseSeeder';
191
+            $foundModules[] = $namespace.'\\'.$name.'\\'.$seederPath.'\\'.$name.'DatabaseSeeder';
192 192
         }
193 193
 
194 194
         return $foundModules;
Please login to merge, or discard this patch.
src/helpers.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (! function_exists('module_path')) {
3
+if (!function_exists('module_path')) {
4 4
     function module_path($name, $path = '')
5 5
     {
6 6
         $module = app('modules')->find($name);
7 7
 
8
-        return $module->getPath() . ($path ? DIRECTORY_SEPARATOR . $path : $path);
8
+        return $module->getPath().($path ? DIRECTORY_SEPARATOR . $path : $path);
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
 block discarded – undo
18 18
      */
19 19
     function config_path($path = '')
20 20
     {
21
-        return app()->basePath() . '/config' . ($path ? DIRECTORY_SEPARATOR . $path : $path);
21
+        return app()->basePath().'/config'.($path ? DIRECTORY_SEPARATOR . $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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
src/LaravelModulesServiceProvider.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -32,10 +32,10 @@  discard block
 block discarded – undo
32 32
      */
33 33
     public function setupStubPath()
34 34
     {
35
-        $path = $this->app['config']->get('modules.stubs.path') ?? __DIR__ . '/Commands/stubs';
35
+        $path = $this->app['config']->get('modules.stubs.path') ?? __DIR__.'/Commands/stubs';
36 36
         Stub::setBasePath($path);
37 37
 
38
-        $this->app->booted(function ($app) {
38
+        $this->app->booted(function($app) {
39 39
             /** @var RepositoryInterface $moduleRepository */
40 40
             $moduleRepository = $app[RepositoryInterface::class];
41 41
             if ($moduleRepository->config('stubs.enabled') === true) {
@@ -49,14 +49,14 @@  discard block
 block discarded – undo
49 49
      */
50 50
     protected function registerServices()
51 51
     {
52
-        $this->app->singleton(Contracts\RepositoryInterface::class, function ($app) {
52
+        $this->app->singleton(Contracts\RepositoryInterface::class, function($app) {
53 53
             $path = $app['config']->get('modules.paths.modules');
54 54
 
55 55
             return new Laravel\LaravelFileRepository($app, $path);
56 56
         });
57
-        $this->app->singleton(Contracts\ActivatorInterface::class, function ($app) {
57
+        $this->app->singleton(Contracts\ActivatorInterface::class, function($app) {
58 58
             $activator = $app['config']->get('modules.activator');
59
-            $class = $app['config']->get('modules.activators.' . $activator)['class'];
59
+            $class = $app['config']->get('modules.activators.'.$activator)['class'];
60 60
 
61 61
             if ($class === null) {
62 62
                 throw InvalidActivatorClass::missingConfig();
Please login to merge, or discard this patch.
src/Commands/MigrateStatusCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
         }
50 50
 
51 51
         foreach ($this->module->getOrdered($this->option('direction')) as $module) {
52
-            $this->line('Running for module: <info>' . $module->getName() . '</info>');
52
+            $this->line('Running for module: <info>'.$module->getName().'</info>');
53 53
             $this->migrateStatus($module);
54 54
         }
55 55
 
Please login to merge, or discard this patch.
src/Commands/ListenerMakeCommand.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -77,10 +77,10 @@  discard block
 block discarded – undo
77 77
 
78 78
     protected function getEventName(Module $module)
79 79
     {
80
-        $namespace = $this->laravel['modules']->config('namespace') . "\\" . $module->getStudlyName();
80
+        $namespace = $this->laravel['modules']->config('namespace')."\\".$module->getStudlyName();
81 81
         $eventPath = GenerateConfigReader::read('event');
82 82
 
83
-        $eventName = $namespace . "\\" . $eventPath->getPath() . "\\" . $this->option('event');
83
+        $eventName = $namespace."\\".$eventPath->getPath()."\\".$this->option('event');
84 84
 
85 85
         return str_replace('/', '\\', $eventName);
86 86
     }
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 
92 92
         $listenerPath = GenerateConfigReader::read('listener');
93 93
 
94
-        return $path . $listenerPath->getPath() . '/' . $this->getFileName() . '.php';
94
+        return $path.$listenerPath->getPath().'/'.$this->getFileName().'.php';
95 95
     }
96 96
 
97 97
     /**
Please login to merge, or discard this patch.
src/Laravel/Module.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,10 +18,10 @@
 block discarded – undo
18 18
         // This checks if we are running on a Laravel Vapor managed instance
19 19
         // and sets the path to a writable one (services path is not on a writable storage in Vapor).
20 20
         if (!is_null(env('VAPOR_MAINTENANCE_MODE', null))) {
21
-            return Str::replaceLast('config.php', $this->getSnakeName() . '_module.php', $this->app->getCachedConfigPath());
21
+            return Str::replaceLast('config.php', $this->getSnakeName().'_module.php', $this->app->getCachedConfigPath());
22 22
         }
23 23
 
24
-        return Str::replaceLast('services.php', $this->getSnakeName() . '_module.php', $this->app->getCachedServicesPath());
24
+        return Str::replaceLast('services.php', $this->getSnakeName().'_module.php', $this->app->getCachedServicesPath());
25 25
     }
26 26
 
27 27
     /**
Please login to merge, or discard this patch.
src/FileRepository.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
     }
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
289 289
     {
290 290
         $modules = $this->allEnabled();
291 291
 
292
-        uasort($modules, function (Module $a, Module $b) use ($direction) {
292
+        uasort($modules, function(Module $a, Module $b) use ($direction) {
293 293
             if ($a->get('priority') === $b->get('priority')) {
294 294
                 return 0;
295 295
             }
@@ -418,9 +418,9 @@  discard block
 block discarded – undo
418 418
     public function getModulePath($module)
419 419
     {
420 420
         try {
421
-            return $this->findOrFail($module)->getPath() . '/';
421
+            return $this->findOrFail($module)->getPath().'/';
422 422
         } catch (ModuleNotFoundException $e) {
423
-            return $this->getPath() . '/' . Str::studly($module) . '/';
423
+            return $this->getPath().'/'.Str::studly($module).'/';
424 424
         }
425 425
     }
426 426
 
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
      */
430 430
     public function assetPath(string $module) : string
431 431
     {
432
-        return $this->config('paths.assets') . '/' . $module;
432
+        return $this->config('paths.assets').'/'.$module;
433 433
     }
434 434
 
435 435
     /**
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
437 437
      */
438 438
     public function config(string $key, $default = null)
439 439
     {
440
-        return $this->config->get('modules.' . $key, $default);
440
+        return $this->config->get('modules.'.$key, $default);
441 441
     }
442 442
 
443 443
     /**
@@ -527,9 +527,9 @@  discard block
 block discarded – undo
527 527
         }
528 528
         list($name, $url) = explode(':', $asset);
529 529
 
530
-        $baseUrl = str_replace(public_path() . DIRECTORY_SEPARATOR, '', $this->getAssetsPath());
530
+        $baseUrl = str_replace(public_path().DIRECTORY_SEPARATOR, '', $this->getAssetsPath());
531 531
 
532
-        $url = $this->url->asset($baseUrl . "/{$name}/" . $url);
532
+        $url = $this->url->asset($baseUrl."/{$name}/".$url);
533 533
 
534 534
         return str_replace(['http://', 'https://'], '//', $url);
535 535
     }
Please login to merge, or discard this patch.
src/Generators/ModuleGenerator.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
                 continue;
332 332
             }
333 333
 
334
-            $path = $this->module->getModulePath($this->getName()) . '/' . $folder->getPath();
334
+            $path = $this->module->getModulePath($this->getName()).'/'.$folder->getPath();
335 335
 
336 336
             $this->filesystem->makeDirectory($path, 0755, true);
337 337
             if (config('modules.stubs.gitkeep')) {
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
      */
348 348
     public function generateGitKeep($path)
349 349
     {
350
-        $this->filesystem->put($path . '/.gitkeep', '');
350
+        $this->filesystem->put($path.'/.gitkeep', '');
351 351
     }
352 352
 
353 353
     /**
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
     public function generateFiles()
357 357
     {
358 358
         foreach ($this->getFiles() as $stub => $file) {
359
-            $path = $this->module->getModulePath($this->getName()) . $file;
359
+            $path = $this->module->getModulePath($this->getName()).$file;
360 360
 
361 361
             if (!$this->filesystem->isDirectory($dir = dirname($path))) {
362 362
                 $this->filesystem->makeDirectory($dir, 0775, true);
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
 
384 384
         if (GenerateConfigReader::read('provider')->generate() === true) {
385 385
             $this->console->call('module:make-provider', [
386
-                'name' => $this->getName() . 'ServiceProvider',
386
+                'name' => $this->getName().'ServiceProvider',
387 387
                 'module' => $this->getName(),
388 388
                 '--master' => true,
389 389
             ]);
@@ -393,11 +393,11 @@  discard block
 block discarded – undo
393 393
         }
394 394
 
395 395
         if (GenerateConfigReader::read('controller')->generate() === true) {
396
-            $options = $this->type=='api'?['--api'=>true]:[];
396
+            $options = $this->type == 'api' ? ['--api'=>true] : [];
397 397
             $this->console->call('module:make-controller', [
398
-                'controller' => $this->getName() . 'Controller',
398
+                'controller' => $this->getName().'Controller',
399 399
                 'module' => $this->getName(),
400
-            ]+$options);
400
+            ] + $options);
401 401
         }
402 402
     }
403 403
 
@@ -411,7 +411,7 @@  discard block
 block discarded – undo
411 411
     protected function getStubContents($stub)
412 412
     {
413 413
         return (new Stub(
414
-            '/' . $stub . '.stub',
414
+            '/'.$stub.'.stub',
415 415
             $this->getReplacement($stub)
416 416
         )
417 417
         )->render();
@@ -459,10 +459,10 @@  discard block
 block discarded – undo
459 459
         }
460 460
 
461 461
         foreach ($keys as $key) {
462
-            if (method_exists($this, $method = 'get' . ucfirst(Str::studly(strtolower($key))) . 'Replacement')) {
462
+            if (method_exists($this, $method = 'get'.ucfirst(Str::studly(strtolower($key))).'Replacement')) {
463 463
                 $replaces[$key] = $this->$method();
464 464
             } else {
465
-                switch($key) {
465
+                switch ($key) {
466 466
                     case 'STUDLY_NAME_WITH_BACKSLASHES':
467 467
                         $replaces[$key] = $this->getStudlyNameReplacement(true);
468 468
                         break;
@@ -488,7 +488,7 @@  discard block
 block discarded – undo
488 488
      */
489 489
     private function generateModuleJsonFile()
490 490
     {
491
-        $path = $this->module->getModulePath($this->getName()) . 'module.json';
491
+        $path = $this->module->getModulePath($this->getName()).'module.json';
492 492
 
493 493
         if (!$this->filesystem->isDirectory($dir = dirname($path))) {
494 494
             $this->filesystem->makeDirectory($dir, 0775, true);
@@ -505,13 +505,13 @@  discard block
 block discarded – undo
505 505
      */
506 506
     private function cleanModuleJsonFile()
507 507
     {
508
-        $path = $this->module->getModulePath($this->getName()) . 'module.json';
508
+        $path = $this->module->getModulePath($this->getName()).'module.json';
509 509
 
510 510
         $content = $this->filesystem->get($path);
511 511
         $namespace = $this->getModuleNamespaceReplacement();
512 512
         $studlyName = $this->getStudlyNameReplacement(true);
513 513
 
514
-        $provider = '"' . $namespace . '\\\\' . $studlyName . '\\\\Providers\\\\' . $studlyName . 'ServiceProvider"';
514
+        $provider = '"'.$namespace.'\\\\'.$studlyName.'\\\\Providers\\\\'.$studlyName.'ServiceProvider"';
515 515
         $provider = str_replace('\\\\\\\\', '\\\\', $provider);
516 516
 
517 517
         $content = str_replace($provider, '', $content);
@@ -534,7 +534,7 @@  discard block
 block discarded – undo
534 534
      *
535 535
      * @return string
536 536
      */
537
-    protected function getStudlyNameReplacement($slashToBackslash=false)
537
+    protected function getStudlyNameReplacement($slashToBackslash = false)
538 538
     {
539 539
         if (!$slashToBackslash) {
540 540
             return $this->getName();
Please login to merge, or discard this patch.