Skip to content

Commit 4c78c47

Browse files
author
Gravitano
committed
Merge branch 'master' into 2.1
2 parents 00c8d86 + bc232d7 commit 4c78c47

11 files changed

Lines changed: 77 additions & 39 deletions

‎Commands/ControllerCommand.php‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,16 @@ protected function getTemplateContents()
5353
$module = $this->laravel['modules']->findOrFail($this->getModuleName());
5454

5555
return (new Stub('/controller.stub', [
56-
'MODULENAME' => $module->getStudlyName(),
57-
'CONTROLLERNAME' => $this->getControllerName(),
58-
'CLASS' => $this->getClass(),
59-
'NAMESPACE' => $module->getLowername(),
60-
'MODULE_NAMESPACE' => $this->laravel['modules']->config('namespace'),
61-
'CLASS_NAMESPACE' => $this->getClassNamespace($module),
56+
'MODULENAME' => $module->getStudlyName(),
57+
'CONTROLLERNAME' => $this->getControllerName(),
58+
'NAMESPACE' => $module->getLowername(),
59+
'CLASS_NAMESPACE' => $this->getClassNamespace($module),
60+
'CLASS' => $this->getClass(),
61+
'LOWER_NAME' => $module->getLowerName(),
62+
'MODULE' => $this->getModuleName(),
63+
'NAME' => $this->getModuleName(),
64+
'STUDLY_NAME' => $module->getStudlyName(),
65+
'MODULE_NAMESPACE' => $this->laravel['modules']->config('namespace'),
6266
]))->render();
6367
}
6468

‎Commands/GenerateFilterCommand.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,13 @@ protected function getTemplateContents()
5353
$module = $this->laravel['modules']->findOrFail($this->getModuleName());
5454

5555
return (new Stub('/filter.stub', [
56-
'NAMESPACE' => $this->getClassNamespace($module),
57-
'CLASS' => $this->getClass(),
56+
'NAMESPACE' => $this->getClassNamespace($module),
57+
'CLASS' => $this->getClass(),
58+
'LOWER_NAME' => $module->getLowerName(),
59+
'MODULE' => $this->getModuleName(),
60+
'NAME' => $this->getFileName(),
61+
'STUDLY_NAME' => $this->getFileName(),
62+
'MODULE_NAMESPACE' => $this->laravel['modules']->config('namespace'),
5863
]))->render();
5964
}
6065

‎Commands/GenerateProviderCommand.php‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,13 @@ protected function getTemplateContents()
6868
$module = $this->laravel['modules']->findOrFail($this->getModuleName());
6969

7070
return (new Stub('/'.$stub.'.stub', [
71-
'NAMESPACE' => $this->getClassNamespace($module),
72-
'CLASS' => $this->getClass(),
73-
'LOWER_NAME' => $module->getLowerName(),
71+
'NAMESPACE' => $this->getClassNamespace($module),
72+
'CLASS' => $this->getClass(),
73+
'LOWER_NAME' => $module->getLowerName(),
74+
'MODULE' => $this->getModuleName(),
75+
'NAME' => $this->getFileName(),
76+
'STUDLY_NAME' => $module->getStudlyName(),
77+
'MODULE_NAMESPACE' => $this->laravel['modules']->config('namespace'),
7478
]))->render();
7579
}
7680

‎Commands/GenerateRouteProviderCommand.php‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,16 @@ protected function getArguments()
4343
*/
4444
protected function getTemplateContents()
4545
{
46+
$module = $this->laravel['modules']->findOrFail($this->getModuleName());
47+
4648
return (new Stub('/route-provider.stub', [
47-
'MODULE' => $this->getModuleName(),
48-
'NAME' => $this->getFileName(),
49-
'MODULE_NAMESPACE' => $this->laravel['modules']->config('namespace'),
49+
'NAMESPACE' => $this->getClassNamespace($module),
50+
'CLASS' => $this->getClass(),
51+
'LOWER_NAME' => $module->getLowerName(),
52+
'MODULE' => $this->getModuleName(),
53+
'NAME' => $this->getFileName(),
54+
'STUDLY_NAME' => $module->getStudlyName(),
55+
'MODULE_NAMESPACE' => $this->laravel['modules']->config('namespace'),
5056
]))->render();
5157
}
5258

‎Commands/MakeRequestCommand.php‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,13 @@ protected function getTemplateContents()
5353
$module = $this->laravel['modules']->findOrFail($this->getModuleName());
5454

5555
return (new Stub('/request.stub', [
56-
'MODULE' => $this->getModuleName(),
57-
'NAME' => $this->getFileName(),
58-
'MODULE_NAMESPACE' => $this->laravel['modules']->config('namespace'),
59-
'NAMESPACE' => $this->getClassNamespace($module),
60-
'CLASS' => $this->getClass(),
56+
'NAMESPACE' => $this->getClassNamespace($module),
57+
'CLASS' => $this->getClass(),
58+
'LOWER_NAME' => $module->getLowerName(),
59+
'MODULE' => $this->getModuleName(),
60+
'NAME' => $this->getFileName(),
61+
'STUDLY_NAME' => $module->getStudlyName(),
62+
'MODULE_NAMESPACE' => $this->laravel['modules']->config('namespace'),
6163
]))->render();
6264
}
6365

‎Commands/MigrateRollbackCommand.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function fire()
4141
return;
4242
}
4343

44-
foreach ($this->laravel['modules']->all() as $module) {
44+
foreach (array_reverse($this->laravel['modules']->all()) as $module) {
4545
$this->line('Running for module: <info>'.$module->getName().'</info>');
4646

4747
$this->rollback($module);

‎Commands/ModelCommand.php‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,14 @@ protected function getTemplateContents()
6666
$module = $this->laravel['modules']->findOrFail($this->getModuleName());
6767

6868
return (new Stub('/model.stub', [
69-
'MODULE' => $this->getModuleName(),
70-
'NAME' => $this->getModelName(),
71-
'FILLABLE' => $this->getFillable(),
72-
'MODULE_NAMESPACE' => $this->laravel['modules']->config('namespace'),
73-
'NAMESPACE' => $this->getClassNamespace($module),
74-
'CLASS' => $this->getClass(),
69+
'NAME' => $this->getModelName(),
70+
'FILLABLE' => $this->getFillable(),
71+
'NAMESPACE' => $this->getClassNamespace($module),
72+
'CLASS' => $this->getClass(),
73+
'LOWER_NAME' => $module->getLowerName(),
74+
'MODULE' => $this->getModuleName(),
75+
'STUDLY_NAME' => $module->getStudlyName(),
76+
'MODULE_NAMESPACE' => $this->laravel['modules']->config('namespace'),
7577
]))->render();
7678
}
7779

‎Commands/SeedCommand.php‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,31 @@ public function fire()
3535
{
3636
$this->module = $this->laravel['modules'];
3737

38-
$module = Str::studly($this->argument('module')) ?: $this->getModuleName();
38+
$name = $this->argument('module');
3939

40-
if ($module) {
41-
if ($this->module->has($module)) {
42-
$this->dbseed($module);
43-
44-
return $this->info("Module [$module] seeded.");
40+
if ($name) {
41+
if (!$this->module->has($name)) {
42+
return $this->error("Module [$name] does not exists.");
4543
}
4644

47-
return $this->error("Module [$module] does not exists.");
45+
$class = $this->getSeederName($name);
46+
if (class_exists($class)) {
47+
$this->dbseed($name);
48+
49+
return $this->info("Module [$name] seeded.");
50+
} else {
51+
return $this->error("Class [$class] does not exists.");
52+
}
4853
}
4954

50-
foreach ($this->module->all() as $name) {
51-
$this->dbseed($name);
55+
foreach ($this->module->getOrdered() as $module) {
56+
$name = $module->getName();
57+
58+
if (class_exists($this->getSeederName($name))) {
59+
$this->dbseed($name);
60+
61+
$this->info("Module [$name] seeded.");
62+
}
5263
}
5364

5465
return $this->info('All modules seeded.');
@@ -87,7 +98,7 @@ public function getSeederName($name)
8798

8899
$namespace = $this->laravel['modules']->config('namespace');
89100

90-
return $namespace.'\\'.$name.'\Database\Seeders\\'.$name.'DatabaseSeeder';
101+
return $namespace.'\\'.$name.'\Database\Seeders\\'.$name.'TableSeeder';
91102
}
92103

93104
/**
@@ -111,7 +122,8 @@ protected function getOptions()
111122
{
112123
return array(
113124
array('class', null, InputOption::VALUE_OPTIONAL, 'The class name of the root seeder', null),
125+
array('all', null, InputOption::VALUE_NONE, 'Whether or not we should seed all modules.'),
114126
array('database', null, InputOption::VALUE_OPTIONAL, 'The database connection to seed.'),
115127
);
116128
}
117-
}
129+
}

‎Commands/SeedMakeCommand.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ protected function getTemplateContents()
6565
'NAME' => $this->getSeederName(),
6666
'MODULE' => $this->getModuleName(),
6767
'MODULE_NAMESPACE' => $this->laravel['modules']->config('namespace'),
68+
6869
]))->render();
6970
}
7071

‎Commands/stubs/scaffold/provider.stub‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ class $CLASS$ extends ServiceProvider {
1818
*/
1919
public function boot()
2020
{
21-
$this->registerConfig();
2221
$this->registerTranslations();
22+
$this->registerConfig();
2323
$this->registerViews();
2424
}
2525

0 commit comments

Comments
 (0)