Skip to content

fix: controller generator #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mohammad-Alavi merged 9 commits into from
Dec 8, 2024
Merged

fix: controller generator #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bb220f5
Fixed stub path in generator
innoflash Jan 19, 2024
784872c
Added expecting model
innoflash Jan 19, 2024
504275d
Collecting model for controller
innoflash Jan 19, 2024
31d00a7
Merge branch '8.x' into pr/194
Mohammad-Alavi Feb 5, 2024
1d01c7b
Merge branch 'apiato:8.x' into fix/controller-gen
innoflash Aug 6, 2024
db9a9cb
Merge branch '8.x' into pr/194
Mohammad-Alavi Dec 8, 2024
5d9b957
Merge branch '8.x' into pr/194
Mohammad-Alavi Dec 8, 2024
daea786
refactor: update message
Mohammad-Alavi Dec 8, 2024
a194c77
feat: pass model name
Mohammad-Alavi Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Generator/Commands/ContainerApiGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ public function getUserInputs(): array|null
'--section' => $sectionName,
'--container' => $containerName,
'--file' => $route['controller'],
'--model' => $model,
'--ui' => $ui,
'--stub' => $route['stub'],
]);
Expand All @@ -360,6 +361,7 @@ public function getUserInputs(): array|null
$this->call('apiato:generate:controller', [
'--section' => $sectionName,
'--container' => $containerName,
'--model' => $model,
'--file' => 'Controller',
'--ui' => $ui,
'--stub' => 'crud',
Expand Down
2 changes: 2 additions & 0 deletions src/Generator/Commands/ContainerWebGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ public function getUserInputs(): array|null
'--section' => $sectionName,
'--container' => $containerName,
'--file' => $route['controller'],
'--model' => $model,
'--ui' => $ui,
'--stub' => $route['stub'],
]);
Expand All @@ -276,6 +277,7 @@ public function getUserInputs(): array|null
'--section' => $sectionName,
'--container' => $containerName,
'--file' => 'Controller',
'--model' => $model,
'--ui' => $ui,
'--stub' => 'crud',
]);
Expand Down
8 changes: 4 additions & 4 deletions src/Generator/Commands/ControllerGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class ControllerGenerator extends GeneratorCommand implements ComponentsGenerato
public array $inputs = [
['ui', null, InputOption::VALUE_OPTIONAL, 'The user-interface to generate the Controller for.'],
['stub', null, InputOption::VALUE_OPTIONAL, 'The stub file to load for this generator.'],
['model', null, InputOption::VALUE_OPTIONAL, 'The model you want to use for this controller.'],
];
/**
* The console command name.
Expand Down Expand Up @@ -50,6 +51,9 @@ class ControllerGenerator extends GeneratorCommand implements ComponentsGenerato

public function getUserInputs(): array|null
{
$model = $this->checkParameterOrAsk('model', 'Enter the name of the Model that this controller uses', $this->containerName);
$models = Pluralizer::plural($model);

$ui = Str::lower($this->checkParameterOrChoice('ui', 'Select the UI for the controller', ['API', 'WEB'], 0));

$stub = Str::lower(
Expand All @@ -66,10 +70,6 @@ public function getUserInputs(): array|null

$basecontroller = Str::ucfirst($ui) . 'Controller';

// Name of the model (singular and plural)
$model = $this->containerName;
$models = Pluralizer::plural($model);

$entity = Str::camel($model);
$entities = Str::of($entity)->pluralStudly()->camel()->toString();

Expand Down