From f319726d37f8d5f418eb6747ecc6067eef3bcfc4 Mon Sep 17 00:00:00 2001 From: Amir Hossein Shokri Date: Wed, 16 Jul 2025 19:32:32 +0330 Subject: [PATCH 1/4] fix db:seed output --- .../Database/Console/Seeds/SeedCommand.php | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/src/Illuminate/Database/Console/Seeds/SeedCommand.php b/src/Illuminate/Database/Console/Seeds/SeedCommand.php index 2c5ab34bb726..8137cb997f62 100644 --- a/src/Illuminate/Database/Console/Seeds/SeedCommand.php +++ b/src/Illuminate/Database/Console/Seeds/SeedCommand.php @@ -5,6 +5,7 @@ use Illuminate\Console\Command; use Illuminate\Console\ConfirmableTrait; use Illuminate\Console\Prohibitable; +use Illuminate\Console\View\Components\TwoColumnDetail; use Illuminate\Database\ConnectionResolverInterface as Resolver; use Illuminate\Database\Eloquent\Model; use Symfony\Component\Console\Attribute\AsCommand; @@ -56,6 +57,8 @@ public function __construct(Resolver $resolver) */ public function handle() { + $isVerbose = $this->output->isVerbose(); + if ($this->isProhibited() || ! $this->confirmToProceed()) { return Command::FAILURE; @@ -67,12 +70,32 @@ public function handle() $this->resolver->setDefaultConnection($this->getDatabase()); - Model::unguarded(function () { - $seeder = $this->getSeeder(); + $startTime = microtime(true); + + $name = get_class($this->getSeeder()); - $this->components->task(get_class($seeder), $seeder); + with(new TwoColumnDetail($this->output))->render( + $isVerbose + ? sprintf('%s %s', $name, $this->resolver->getDefaultConnection()) + : $name, + 'RUNNING' + ); + + $this->output?->writeln(''); + + Model::unguarded(function () { + $this->getSeeder()->__invoke(); }); + $runTime = number_format((microtime(true) - $startTime) * 1000); + + with(new TwoColumnDetail($this->output))->render( + $isVerbose + ? sprintf('%s %s', $name, $this->resolver->getDefaultConnection()) + : $name, + "$runTime ms DONE" + ); + $this->output?->writeln(''); if ($previousConnection) { From 8affa66de0176b03606b5e07709af97dd71cc67c Mon Sep 17 00:00:00 2001 From: Amir Hossein Shokri Date: Wed, 16 Jul 2025 20:51:02 +0330 Subject: [PATCH 2/4] fix tests --- src/Illuminate/Database/Console/Seeds/SeedCommand.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Illuminate/Database/Console/Seeds/SeedCommand.php b/src/Illuminate/Database/Console/Seeds/SeedCommand.php index 8137cb997f62..c5de5242b177 100644 --- a/src/Illuminate/Database/Console/Seeds/SeedCommand.php +++ b/src/Illuminate/Database/Console/Seeds/SeedCommand.php @@ -70,9 +70,11 @@ public function handle() $this->resolver->setDefaultConnection($this->getDatabase()); + $seeder = $this->getSeeder(); + $startTime = microtime(true); - $name = get_class($this->getSeeder()); + $name = get_class($seeder); with(new TwoColumnDetail($this->output))->render( $isVerbose @@ -83,8 +85,8 @@ public function handle() $this->output?->writeln(''); - Model::unguarded(function () { - $this->getSeeder()->__invoke(); + Model::unguarded(function () use ($seeder) { + $seeder->__invoke(); }); $runTime = number_format((microtime(true) - $startTime) * 1000); From 6a6fdcd60606109283be7cb6007cc600568da499 Mon Sep 17 00:00:00 2001 From: Amir Hossein Shokri Date: Wed, 16 Jul 2025 21:39:34 +0330 Subject: [PATCH 3/4] refactor --- src/Illuminate/Database/Console/Seeds/SeedCommand.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Illuminate/Database/Console/Seeds/SeedCommand.php b/src/Illuminate/Database/Console/Seeds/SeedCommand.php index c5de5242b177..56dce2eea93a 100644 --- a/src/Illuminate/Database/Console/Seeds/SeedCommand.php +++ b/src/Illuminate/Database/Console/Seeds/SeedCommand.php @@ -85,9 +85,7 @@ public function handle() $this->output?->writeln(''); - Model::unguarded(function () use ($seeder) { - $seeder->__invoke(); - }); + Model::unguarded(fn() => $seeder->__invoke()); $runTime = number_format((microtime(true) - $startTime) * 1000); From 7c809e70971966d26c33edf4363968c61bf637a4 Mon Sep 17 00:00:00 2001 From: Amir Hossein Shokri Date: Wed, 16 Jul 2025 21:41:13 +0330 Subject: [PATCH 4/4] fix style ci --- src/Illuminate/Database/Console/Seeds/SeedCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Database/Console/Seeds/SeedCommand.php b/src/Illuminate/Database/Console/Seeds/SeedCommand.php index 56dce2eea93a..e23bed973f6c 100644 --- a/src/Illuminate/Database/Console/Seeds/SeedCommand.php +++ b/src/Illuminate/Database/Console/Seeds/SeedCommand.php @@ -85,7 +85,7 @@ public function handle() $this->output?->writeln(''); - Model::unguarded(fn() => $seeder->__invoke()); + Model::unguarded(fn () => $seeder->__invoke()); $runTime = number_format((microtime(true) - $startTime) * 1000);