Skip to content

Commit 028c2fd

Browse files
committed
♻️ wrong quick start functionment
1 parent 0ea2509 commit 028c2fd

File tree

2 files changed

+21
-18
lines changed

2 files changed

+21
-18
lines changed

src/Console/Commands/QuickStartCommand.php

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,9 @@ public function handle()
3333
{
3434
$this->comment('Generating User Resource...');
3535
$this->callSilent('rest:resource', ['name' => 'UserResource']);
36-
copy($this->resolveStubPath('/stubs/user-resource.stub'), app_path('Rest/Resources/UserResource.php'));
3736

3837
$this->comment('Generating User Controller...');
3938
$this->callSilent('rest:controller', ['name' => 'UsersController']);
40-
copy($this->resolveStubPath('/stubs/user-controller.stub'), app_path('Rest/Controllers/UsersController.php'));
4139

4240
$this->updateUserModelNamespace();
4341
$this->setAppNamespace();
@@ -53,18 +51,22 @@ public function handle()
5351
*/
5452
protected function updateUserModelNamespace()
5553
{
56-
$files = [
57-
app_path('Rest/Resources/UserResource.php'),
58-
app_path('Rest/Controllers/UsersController.php')
59-
];
60-
61-
foreach ($files as $file) {
62-
if (file_exists(app_path('Models/User.php'))) {
63-
file_put_contents(
64-
$file,
65-
str_replace('App\User::class', 'App\Models\User::class', file_get_contents($file))
66-
);
67-
}
54+
$resource = app_path('Rest/Resources/UserResource.php');
55+
56+
if (file_exists(app_path('Models/User.php'))) {
57+
file_put_contents(
58+
$resource,
59+
str_replace('App\Models\Model::class', 'App\Models\User::class', file_get_contents($resource))
60+
);
61+
}
62+
63+
$controller = app_path('Rest/Controllers/UsersController.php');
64+
65+
if (file_exists(app_path('Models/User.php'))) {
66+
file_put_contents(
67+
$controller,
68+
str_replace('App\Rest\Resources\ModelResource::class', 'App\Rest\Resources\UserResource::class', file_get_contents($controller))
69+
);
6870
}
6971
}
7072

@@ -76,15 +78,16 @@ protected function updateUserModelNamespace()
7678
protected function setAppNamespace()
7779
{
7880
$namespace = $this->laravel->getNamespace();
81+
7982
$this->setAppNamespaceOn(app_path('Rest/Resources/UserResource.php'), $namespace);
8083
$this->setAppNamespaceOn(app_path('Rest/Controllers/UsersController.php'), $namespace);
8184
}
8285

8386
/**
8487
* Set the namespace on the given file.
8588
*
86-
* @param string $file
87-
* @param string $namespace
89+
* @param string $file
90+
* @param string $namespace
8891
*
8992
* @return void
9093
*/

src/Console/Commands/ResourceCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ protected function getPath($name)
7070
*/
7171
protected function buildClass($name)
7272
{
73-
$model = $this->option('model') ?? 'App\\Models\\Model';
73+
$model = $this->option('model');
7474

7575
$modelNamespace = $this->getModelNamespace();
7676

7777
if (is_null($model)) {
78-
$resource = $modelNamespace.str_replace('/', '\\', $this->argument('name'));
78+
$model = $modelNamespace.'Model';
7979
} elseif (!Str::startsWith($model, [
8080
$modelNamespace, '\\',
8181
])) {

0 commit comments

Comments
 (0)