Completed
Pull Request — master (#1073)
by Nicolas
16:01
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/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/Generators/ModuleGenerator.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
                 continue;
330 330
             }
331 331
 
332
-            $path = $this->module->getModulePath($this->getName()) . '/' . $folder->getPath();
332
+            $path = $this->module->getModulePath($this->getName()).'/'.$folder->getPath();
333 333
 
334 334
             $this->filesystem->makeDirectory($path, 0755, true);
335 335
             if (config('modules.stubs.gitkeep')) {
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
      */
346 346
     public function generateGitKeep($path)
347 347
     {
348
-        $this->filesystem->put($path . '/.gitkeep', '');
348
+        $this->filesystem->put($path.'/.gitkeep', '');
349 349
     }
350 350
 
351 351
     /**
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
     public function generateFiles()
355 355
     {
356 356
         foreach ($this->getFiles() as $stub => $file) {
357
-            $path = $this->module->getModulePath($this->getName()) . $file;
357
+            $path = $this->module->getModulePath($this->getName()).$file;
358 358
 
359 359
             if (!$this->filesystem->isDirectory($dir = dirname($path))) {
360 360
                 $this->filesystem->makeDirectory($dir, 0775, true);
@@ -381,7 +381,7 @@  discard block
 block discarded – undo
381 381
 
382 382
         if (GenerateConfigReader::read('provider')->generate() === true) {
383 383
             $this->console->call('module:make-provider', [
384
-                'name' => $this->getName() . 'ServiceProvider',
384
+                'name' => $this->getName().'ServiceProvider',
385 385
                 'module' => $this->getName(),
386 386
                 '--master' => true,
387 387
             ]);
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
392 392
 
393 393
         if (GenerateConfigReader::read('controller')->generate() === true) {
394 394
             $this->console->call('module:make-controller', [
395
-                'controller' => $this->getName() . 'Controller',
395
+                'controller' => $this->getName().'Controller',
396 396
                 'module' => $this->getName(),
397 397
             ]);
398 398
         }
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
     protected function getStubContents($stub)
409 409
     {
410 410
         return (new Stub(
411
-            '/' . $stub . '.stub',
411
+            '/'.$stub.'.stub',
412 412
             $this->getReplacement($stub)
413 413
         )
414 414
         )->render();
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
             }
448 448
         }
449 449
         foreach ($keys as $key) {
450
-            if (method_exists($this, $method = 'get' . ucfirst(Str::studly(strtolower($key))) . 'Replacement')) {
450
+            if (method_exists($this, $method = 'get'.ucfirst(Str::studly(strtolower($key))).'Replacement')) {
451 451
                 $replaces[$key] = $this->$method();
452 452
             } else {
453 453
                 $replaces[$key] = null;
@@ -462,7 +462,7 @@  discard block
 block discarded – undo
462 462
      */
463 463
     private function generateModuleJsonFile()
464 464
     {
465
-        $path = $this->module->getModulePath($this->getName()) . 'module.json';
465
+        $path = $this->module->getModulePath($this->getName()).'module.json';
466 466
 
467 467
         if (!$this->filesystem->isDirectory($dir = dirname($path))) {
468 468
             $this->filesystem->makeDirectory($dir, 0775, true);
@@ -479,13 +479,13 @@  discard block
 block discarded – undo
479 479
      */
480 480
     private function cleanModuleJsonFile()
481 481
     {
482
-        $path = $this->module->getModulePath($this->getName()) . 'module.json';
482
+        $path = $this->module->getModulePath($this->getName()).'module.json';
483 483
 
484 484
         $content = $this->filesystem->get($path);
485 485
         $namespace = $this->getModuleNamespaceReplacement();
486 486
         $studlyName = $this->getStudlyNameReplacement();
487 487
 
488
-        $provider = '"' . $namespace . '\\\\' . $studlyName . '\\\\Providers\\\\' . $studlyName . 'ServiceProvider"';
488
+        $provider = '"'.$namespace.'\\\\'.$studlyName.'\\\\Providers\\\\'.$studlyName.'ServiceProvider"';
489 489
 
490 490
         $content = str_replace($provider, '', $content);
491 491
 
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/Laravel/Module.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -17,11 +17,11 @@
 block discarded – undo
17 17
     {
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
-        if(!is_null(env('VAPOR_MAINTENANCE_MODE', null))) {
21
-            return Str::replaceLast('config.php', $this->getSnakeName() . '_module.php', $this->app->getCachedConfigPath());
20
+        if (!is_null(env('VAPOR_MAINTENANCE_MODE', null))) {
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.