@@ -24,12 +24,10 @@ public function all(): void
2424 $ seeder_files = [];
2525
2626 foreach (glob ($ this ->setting ->getSeederDirectory () . '/*.php ' ) as $ seeder_file ) {
27- $ seeder_files [$ seeder_file ] = explode ('. ' , basename ($ seeder_file ))[0 ];
27+ $ seeder_files [$ seeder_file ] = $ this -> normalizeClassName ( explode ('. ' , basename ($ seeder_file ))[0 ]) ;
2828 }
2929
3030 foreach ($ seeder_files as $ seeder_file => $ seeder_class_name ) {
31- echo Color::green ("Seeding: $ seeder_file " );
32-
3331 $ this ->make ($ seeder_file , $ seeder_class_name );
3432 }
3533 }
@@ -44,13 +42,11 @@ private function make(string $seed_filename, string $seeder_class_name): void
4442 {
4543 try {
4644 include_once $ seed_filename ;
47- $ time = explode ('- ' , $ seeder_class_name )[0 ];
48- $ seeder_class_name = str_replace ($ time , '' , $ seeder_class_name );
49- $ seeder_class_name = Str::camel ($ seeder_class_name );
5045 (new $ seeder_class_name ())->run ();
46+ echo Color::green ("Seeding completed: $ seed_filename \n" );
5147 } catch (Exception $ e ) {
52- echo Color::red ($ e ->getMessage ());
5348 echo Color::red ("Seeding failed for: $ seed_filename " );
49+ echo Color::red ("\n" . $ e ->getMessage ());
5450 }
5551 }
5652
@@ -66,21 +62,31 @@ public function file(?string $seeder_class_name = null): void
6662 $ this ->throwFailsCommand ('Specify the seeder file name ' , 'help seed ' );
6763 }
6864
69- $ seeder_file = [];
65+ $ seeder_files = [];
7066
7167 foreach (glob ($ this ->setting ->getSeederDirectory () . '/*.php ' ) as $ seeder_file ) {
72- $ basename = explode ('. ' , basename ($ seeder_file ))[0 ];
73- if ($ seeder_class_name != $ basename ) {
68+ $ interal_class_base_name = $ this -> normalizeClassName ( explode ('. ' , basename ($ seeder_file ))[0 ]) ;
69+ if ($ seeder_class_name != $ interal_class_base_name ) {
7470 continue ;
7571 }
76- $ seeder_file [$ seeder_file ] = explode ( ' . ' , basename ( $ seeder_file ))[ 0 ] ;
72+ $ seeder_files [$ seeder_file ] = $ interal_class_base_name ;
7773 break ;
7874 }
7975
80- foreach ($ seeder_file as $ seeder_file => $ seeder_class_name ) {
81- echo Color::green ("Seeding: $ seeder_file " );
76+ foreach ($ seeder_files as $ file => $ seeder_class_name ) {
77+ echo Color::green ("Seeding: $ file " );
8278
83- $ this ->make ($ seeder_file , $ seeder_class_name );
79+ $ this ->make ($ file , $ seeder_class_name );
80+
81+ echo Color::green ("Seeding completed: $ file " );
8482 }
8583 }
84+
85+ private function normalizeClassName (string $ seeder_class_name ): string
86+ {
87+ $ time = explode ('- ' , $ seeder_class_name )[0 ];
88+ $ seeder_class_name = str_replace ($ time , '' , $ seeder_class_name );
89+
90+ return Str::camel ($ seeder_class_name ) . $ time ;
91+ }
8692}
0 commit comments