chore: refactor tap() calls

laravel-zero · Oct 8, 2024 · b9ded5f · b9ded5f
1 parent d9cb08a
commit b9ded5f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/src/Commands/BuildCommand.php b/src/Commands/BuildCommand.php
@@ -141,13 +141,15 @@ private function compile(string $name): BuildCommand
         /** @phpstan-ignore-next-line This is an instance of `ConsoleOutputInterface` */
         $section = tap($this->originalOutput->section())->write('');
 
-        $progressBar = tap(
-            new ProgressBar(
-                $this->output->getVerbosity() > OutputInterface::VERBOSITY_NORMAL ? new NullOutput : $section, 25
-            )
-        )->setProgressCharacter("\xF0\x9F\x8D\xBA");
+        $progressBar = new ProgressBar(
+            $this->output->getVerbosity() > OutputInterface::VERBOSITY_NORMAL ? new NullOutput : $section, 25
+        );
+
+        $progressBar->setProgressCharacter("\xF0\x9F\x8D\xBA");
+
+        $process->start();
 
-        foreach (tap($process)->start() as $type => $data) {
+        foreach ($process as $type => $data) {
             $progressBar->advance();
 
             if ($this->output->getVerbosity() > OutputInterface::VERBOSITY_NORMAL) {

diff --git a/src/Commands/InstallCommand.php b/src/Commands/InstallCommand.php
@@ -14,6 +14,7 @@
 namespace LaravelZero\Framework\Commands;
 
 use LaravelZero\Framework\Components;
+use LaravelZero\Framework\Components\AbstractInstaller;
 use Symfony\Component\Console\Input\ArrayInput;
 
 final class InstallCommand extends Command
@@ -46,9 +47,6 @@ final class InstallCommand extends Command
         'view' => Components\View\Installer::class,
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     public function handle()
     {
         $title = 'Laravel Zero - Component installer';
@@ -63,7 +61,10 @@ public function handle()
         }
 
         if ($option !== null && ! empty($this->componentInstallers[$option])) {
-            $command = tap($this->app[$this->componentInstallers[$option]])->setLaravel($this->app);
+            /** @var AbstractInstaller $command */
+            $command = $this->app[$this->componentInstallers[$option]];
+
+            $command->setLaravel($this->app);
 
             $command->setApplication($this->getApplication());