Skip to content

Commit 2b5bd95

Browse files
authored
Merge pull request #76 from gazsp/analysis-5ZPgGx
These changes should have been included in the merge. Have to reapply.
2 parents c3a8222 + c98fc72 commit 2b5bd95

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

Diff for: src/Baum/Console/ModelMakeCommand.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ public function handle()
4141
}
4242

4343
if ($this->option('all')) {
44-
$this->input->setOption('factory', true);
45-
$this->input->setOption('seed', true);
46-
$this->input->setOption('migration', true);
47-
$this->input->setOption('controller', true);
48-
$this->input->setOption('resource', true);
44+
$this->input->setOption('factory', true);
45+
$this->input->setOption('seed', true);
46+
$this->input->setOption('migration', true);
47+
$this->input->setOption('controller', true);
48+
$this->input->setOption('resource', true);
4949
}
5050

5151
if ($this->option('factory')) {
@@ -141,7 +141,7 @@ protected function getStub()
141141
// return $this->option('pivot')
142142
// ? $this->resolveStubPath('/stubs/model.pivot.stub')
143143
// : $this->resolveStubPath('/stubs/baum.stub');
144-
return $this->resolveStubPath('/stubs/baum.stub');
144+
return $this->resolveStubPath('/stubs/baum.stub');
145145
}
146146

147147
/**
@@ -165,13 +165,13 @@ protected function resolveStubPath($stub)
165165
protected function getOptions()
166166
{
167167
return [
168-
['all', 'a', InputOption::VALUE_NONE, 'Generate a migration, seeder, factory, and resource controller for the model'],
168+
['all', 'a', InputOption::VALUE_NONE, 'Generate a migration, seeder, factory, and resource controller for the model'],
169169
['controller', 'c', InputOption::VALUE_NONE, 'Create a new controller for the model'],
170170
['factory', 'f', InputOption::VALUE_NONE, 'Create a new factory for the model'],
171171
['force', null, InputOption::VALUE_NONE, 'Create the class even if the model already exists'],
172172
['migration', 'm', InputOption::VALUE_NONE, 'Create a new migration file for the model'],
173173
['seed', 's', InputOption::VALUE_NONE, 'Create a new seeder file for the model'],
174-
// ['pivot', 'p', InputOption::VALUE_NONE, 'Indicates if the generated model should be a custom intermediate table model'],
174+
// ['pivot', 'p', InputOption::VALUE_NONE, 'Indicates if the generated model should be a custom intermediate table model'],
175175
['resource', 'r', InputOption::VALUE_NONE, 'Indicates if the generated controller should be a resource controller'],
176176
['api', null, InputOption::VALUE_NONE, 'Indicates if the generated controller should be an API controller'],
177177
];

Diff for: src/Baum/Providers/BaumServiceProvider.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
namespace Baum\Providers;
44

5-
use Baum\Console\InstallCommand;
6-
use Baum\Generators\MigrationGenerator;
7-
use Baum\Generators\ModelGenerator;
85
use Illuminate\Support\ServiceProvider;
96

107
class BaumServiceProvider extends ServiceProvider
@@ -14,7 +11,8 @@ class BaumServiceProvider extends ServiceProvider
1411
*
1512
* @return void
1613
*/
17-
public function boot() {
14+
public function boot()
15+
{
1816

1917
// Load Commands
2018
if ($this->app->runningInConsole()) {

Diff for: tests/Basic/BasicBaumTest.php

-1
Original file line numberDiff line numberDiff line change
@@ -253,5 +253,4 @@ public function makeBaumTest()
253253
->expectsOutput('Model created successfully.')
254254
->assertExitCode(0);
255255
}
256-
257256
}

0 commit comments

Comments
 (0)