@@ -123,14 +123,14 @@ |
||
| 123 | 123 | |
| 124 | 124 | // any JSON parsing errors should throw an exception |
| 125 | 125 | if (json_last_error() > 0) { |
| 126 | - throw new InvalidJsonException('Error processing file: ' . $this->getPath() . '. Error: ' . json_last_error_msg()); |
|
| 126 | + throw new InvalidJsonException('Error processing file: '.$this->getPath().'. Error: '.json_last_error_msg()); |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | if (config('modules.cache.enabled') === false) { |
| 130 | 130 | return $attributes; |
| 131 | 131 | } |
| 132 | 132 | |
| 133 | - return app('cache')->remember($this->getPath(), config('modules.cache.lifetime'), function () use ($attributes) { |
|
| 133 | + return app('cache')->remember($this->getPath(), config('modules.cache.lifetime'), function() use ($attributes) { |
|
| 134 | 134 | return $attributes; |
| 135 | 135 | }); |
| 136 | 136 | } |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | */ |
| 145 | 145 | public function createField($column, $attributes, $type = 'add') |
| 146 | 146 | { |
| 147 | - $results = "\t\t\t" . '$table'; |
|
| 147 | + $results = "\t\t\t".'$table'; |
|
| 148 | 148 | |
| 149 | 149 | foreach ($attributes as $key => $field) { |
| 150 | 150 | if (in_array($column, $this->relationshipKeys)) { |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | } |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | - return $results . ';' . PHP_EOL; |
|
| 157 | + return $results.';'.PHP_EOL; |
|
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | /** |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | */ |
| 169 | 169 | protected function addRelationColumn($key, $field, $column) |
| 170 | 170 | { |
| 171 | - $relatedColumn = snake_case(class_basename($field)) . '_id'; |
|
| 171 | + $relatedColumn = snake_case(class_basename($field)).'_id'; |
|
| 172 | 172 | |
| 173 | 173 | $method = 'integer'; |
| 174 | 174 | |
@@ -187,18 +187,18 @@ discard block |
||
| 187 | 187 | protected function addColumn($key, $field, $column) |
| 188 | 188 | { |
| 189 | 189 | if ($this->hasCustomAttribute($column)) { |
| 190 | - return '->' . $field; |
|
| 190 | + return '->'.$field; |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | if ($key == 0) { |
| 194 | - return '->' . $field . "('" . $column . "')"; |
|
| 194 | + return '->'.$field."('".$column."')"; |
|
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | if (str_contains($field, '(')) { |
| 198 | - return '->' . $field; |
|
| 198 | + return '->'.$field; |
|
| 199 | 199 | } |
| 200 | 200 | |
| 201 | - return '->' . $field . '()'; |
|
| 201 | + return '->'.$field.'()'; |
|
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | /** |
@@ -213,10 +213,10 @@ discard block |
||
| 213 | 213 | protected function removeColumn($key, $field, $column) |
| 214 | 214 | { |
| 215 | 215 | if ($this->hasCustomAttribute($column)) { |
| 216 | - return '->' . $field; |
|
| 216 | + return '->'.$field; |
|
| 217 | 217 | } |
| 218 | 218 | |
| 219 | - return '->dropColumn(' . "'" . $column . "')"; |
|
| 219 | + return '->dropColumn('."'".$column."')"; |
|
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | /** |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | */ |
| 242 | 242 | public function getAttributes($column, $schema) |
| 243 | 243 | { |
| 244 | - $fields = str_replace($column . ':', '', $schema); |
|
| 244 | + $fields = str_replace($column.':', '', $schema); |
|
| 245 | 245 | |
| 246 | 246 | return $this->hasCustomAttribute($column) ? $this->getCustomAttribute($column) : explode(':', $fields); |
| 247 | 247 | } |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | foreach ($this->module->getOrdered($this->option('direction')) as $module) { |
| 50 | - $this->line('Running for module: <info>' . $module->getName() . '</info>'); |
|
| 50 | + $this->line('Running for module: <info>'.$module->getName().'</info>'); |
|
| 51 | 51 | |
| 52 | 52 | $this->migrate($module); |
| 53 | 53 | } |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | $path = str_replace(base_path(), '', (new Migrator($module))->getPath()); |
| 64 | 64 | |
| 65 | 65 | if ($this->option('subpath')) { |
| 66 | - $path = $path . "/" . $this->option("subpath"); |
|
| 66 | + $path = $path."/".$this->option("subpath"); |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | $this->call('migrate', [ |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | $name = $module->getName(); |
| 92 | 92 | $config = $module->get('migration'); |
| 93 | 93 | if (is_array($config) && array_key_exists('seeds', $config)) { |
| 94 | - foreach ((array)$config['seeds'] as $class) { |
|
| 94 | + foreach ((array) $config['seeds'] as $class) { |
|
| 95 | 95 | if (class_exists($class)) { |
| 96 | 96 | $seeders[] = $class; |
| 97 | 97 | } |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | |
| 145 | 145 | $namespace = $this->laravel['modules']->config('namespace'); |
| 146 | 146 | |
| 147 | - return $namespace . '\\' . $name . '\Database\Seeders\\' . $name . 'DatabaseSeeder'; |
|
| 147 | + return $namespace.'\\'.$name.'\Database\Seeders\\'.$name.'DatabaseSeeder'; |
|
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | /** |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | $modules = []; |
| 40 | 40 | |
| 41 | 41 | foreach ($cached as $name => $module) { |
| 42 | - $path = $this->config('paths.modules') . '/' . $name; |
|
| 42 | + $path = $this->config('paths.modules').'/'.$name; |
|
| 43 | 43 | |
| 44 | 44 | $modules[$name] = new Module($this->app, $name, $path); |
| 45 | 45 | } |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | */ |
| 15 | 15 | public function getCachedServicesPath() |
| 16 | 16 | { |
| 17 | - return Str::replaceLast('services.php', $this->getSnakeName() . '_module.php', $this->app->getCachedServicesPath()); |
|
| 17 | + return Str::replaceLast('services.php', $this->getSnakeName().'_module.php', $this->app->getCachedServicesPath()); |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | /** |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function getCachedServicesPath() |
| 14 | 14 | { |
| 15 | - return Str::replaceLast('services.php', $this->getSnakeName() . '_module.php', $this->app->basePath('storage/app/') . 'services.php'); |
|
| 15 | + return Str::replaceLast('services.php', $this->getSnakeName().'_module.php', $this->app->basePath('storage/app/').'services.php'); |
|
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | /** |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | { |
| 100 | 100 | $paths = $this->paths; |
| 101 | 101 | |
| 102 | - $paths[] = $this->getPath() . '/*'; |
|
| 102 | + $paths[] = $this->getPath().'/*'; |
|
| 103 | 103 | |
| 104 | 104 | if ($this->config('scan.enabled')) { |
| 105 | 105 | $paths = array_merge($paths, $this->config('scan.paths')); |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | */ |
| 146 | 146 | public function getCached() |
| 147 | 147 | { |
| 148 | - return $this->app['cache']->remember($this->config('cache.key'), $this->config('cache.lifetime'), function () { |
|
| 148 | + return $this->app['cache']->remember($this->config('cache.key'), $this->config('cache.lifetime'), function() { |
|
| 149 | 149 | return $this->toCollection()->toArray(); |
| 150 | 150 | }); |
| 151 | 151 | } |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | { |
| 234 | 234 | $modules = $this->enabled(); |
| 235 | 235 | |
| 236 | - uasort($modules, function (Module $a, Module $b) use ($direction) { |
|
| 236 | + uasort($modules, function(Module $a, Module $b) use ($direction) { |
|
| 237 | 237 | if ($a->order == $b->order) { |
| 238 | 238 | return 0; |
| 239 | 239 | } |
@@ -382,9 +382,9 @@ discard block |
||
| 382 | 382 | public function getModulePath($module) |
| 383 | 383 | { |
| 384 | 384 | try { |
| 385 | - return $this->findOrFail($module)->getPath() . '/'; |
|
| 385 | + return $this->findOrFail($module)->getPath().'/'; |
|
| 386 | 386 | } catch (ModuleNotFoundException $e) { |
| 387 | - return $this->getPath() . '/' . Str::studly($module) . '/'; |
|
| 387 | + return $this->getPath().'/'.Str::studly($module).'/'; |
|
| 388 | 388 | } |
| 389 | 389 | } |
| 390 | 390 | |
@@ -397,7 +397,7 @@ discard block |
||
| 397 | 397 | */ |
| 398 | 398 | public function assetPath($module) |
| 399 | 399 | { |
| 400 | - return $this->config('paths.assets') . '/' . $module; |
|
| 400 | + return $this->config('paths.assets').'/'.$module; |
|
| 401 | 401 | } |
| 402 | 402 | |
| 403 | 403 | /** |
@@ -410,7 +410,7 @@ discard block |
||
| 410 | 410 | */ |
| 411 | 411 | public function config($key, $default = null) |
| 412 | 412 | { |
| 413 | - return $this->app['config']->get('modules.' . $key, $default); |
|
| 413 | + return $this->app['config']->get('modules.'.$key, $default); |
|
| 414 | 414 | } |
| 415 | 415 | |
| 416 | 416 | /** |
@@ -501,9 +501,9 @@ discard block |
||
| 501 | 501 | } |
| 502 | 502 | list($name, $url) = explode(':', $asset); |
| 503 | 503 | |
| 504 | - $baseUrl = str_replace(public_path() . DIRECTORY_SEPARATOR, '', $this->getAssetsPath()); |
|
| 504 | + $baseUrl = str_replace(public_path().DIRECTORY_SEPARATOR, '', $this->getAssetsPath()); |
|
| 505 | 505 | |
| 506 | - $url = $this->app['url']->asset($baseUrl . "/{$name}/" . $url); |
|
| 506 | + $url = $this->app['url']->asset($baseUrl."/{$name}/".$url); |
|
| 507 | 507 | |
| 508 | 508 | return str_replace(['http://', 'https://'], '//', $url); |
| 509 | 509 | } |
@@ -30,9 +30,9 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function setupStubPath() |
| 32 | 32 | { |
| 33 | - Stub::setBasePath(__DIR__ . '/Commands/stubs'); |
|
| 33 | + Stub::setBasePath(__DIR__.'/Commands/stubs'); |
|
| 34 | 34 | |
| 35 | - $this->app->booted(function ($app) { |
|
| 35 | + $this->app->booted(function($app) { |
|
| 36 | 36 | if ($app['modules']->config('stubs.enabled') === true) { |
| 37 | 37 | Stub::setBasePath($app['modules']->config('stubs.path')); |
| 38 | 38 | } |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | */ |
| 45 | 45 | protected function registerServices() |
| 46 | 46 | { |
| 47 | - $this->app->singleton('modules', function ($app) { |
|
| 47 | + $this->app->singleton('modules', function($app) { |
|
| 48 | 48 | $path = $app['config']->get('modules.paths.modules'); |
| 49 | 49 | |
| 50 | 50 | return new \Nwidart\Modules\Laravel\Repository($app, $path); |