From ad99b5e3c51b955c054d786dd06c9a978a8db942 Mon Sep 17 00:00:00 2001 From: "Mr. Programmer lin" Date: Thu, 17 Mar 2022 18:14:25 +0330 Subject: [PATCH 1/4] fix make:seeder command nested namespace and class name problem --- .../Database/Console/Seeds/SeederMakeCommand.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php b/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php index 716f18729dd6..b73c48226d12 100644 --- a/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php +++ b/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php @@ -3,6 +3,7 @@ namespace Illuminate\Database\Console\Seeds; use Illuminate\Console\GeneratorCommand; +use Illuminate\Support\Str; class SeederMakeCommand extends GeneratorCommand { @@ -77,21 +78,24 @@ protected function resolveStubPath($stub) */ protected function getPath($name) { + $name = Str::replaceFirst($this->rootNamespace(), '', $name); + $name = str_replace('\\', '/', $name); + if (is_dir($this->laravel->databasePath().'/seeds')) { return $this->laravel->databasePath().'/seeds/'.$name.'.php'; - } else { - return $this->laravel->databasePath().'/seeders/'.$name.'.php'; } + + return $this->laravel->databasePath().'/seeders/'.$name.'.php'; } /** - * Parse the class name and format according to the root namespace. + * Get the root namespace for the class. * - * @param string $name * @return string */ - protected function qualifyClass($name) + protected function rootNamespace() { - return $name; + return 'Database\Seeders\\'; } + } From edcf0c7ce4e291ef07329c1195c0f6fb64cb5507 Mon Sep 17 00:00:00 2001 From: "Mr. Programmer lin" Date: Thu, 17 Mar 2022 19:35:17 +0330 Subject: [PATCH 2/4] change make:seeder generated stub file --- src/Illuminate/Database/Console/Seeds/stubs/seeder.stub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Database/Console/Seeds/stubs/seeder.stub b/src/Illuminate/Database/Console/Seeds/stubs/seeder.stub index 29e4af4ea2a8..19ae5f5eb227 100644 --- a/src/Illuminate/Database/Console/Seeds/stubs/seeder.stub +++ b/src/Illuminate/Database/Console/Seeds/stubs/seeder.stub @@ -1,6 +1,6 @@ Date: Thu, 17 Mar 2022 20:14:10 +0330 Subject: [PATCH 3/4] fix style --- src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php b/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php index b73c48226d12..80420b8c273a 100644 --- a/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php +++ b/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php @@ -97,5 +97,4 @@ protected function rootNamespace() { return 'Database\Seeders\\'; } - } From d354427265d05e3442b871c24b13590294057646 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 17 Mar 2022 13:42:24 -0500 Subject: [PATCH 4/4] formatting --- src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php b/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php index 80420b8c273a..ca659a742294 100644 --- a/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php +++ b/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php @@ -78,8 +78,7 @@ protected function resolveStubPath($stub) */ protected function getPath($name) { - $name = Str::replaceFirst($this->rootNamespace(), '', $name); - $name = str_replace('\\', '/', $name); + $name = str_replace('\\', '/', Str::replaceFirst($this->rootNamespace(), '', $name)); if (is_dir($this->laravel->databasePath().'/seeds')) { return $this->laravel->databasePath().'/seeds/'.$name.'.php';