Merge pull request #87 from TheDragonCode/3.x

Resolved output buffer with call nested commands

Author: andrey-helldar

src/Concerns/Artisan.php

@@ -5,6 +5,7 @@
 namespace DragonCode\LaravelActions\Concerns;
 
 use Illuminate\Support\Facades\Artisan as Command;
+use Symfony\Component\Console\Output\OutputInterface;
 
 trait Artisan
 {
@@ -13,11 +14,12 @@ trait Artisan
      *
      * @param string $command
      * @param array $parameters
+     * @param \Symfony\Component\Console\Output\OutputInterface|null $outputBuffer
      *
      * @return void
      */
-    protected function artisan(string $command, array $parameters = []): void
+    protected function artisan(string $command, array $parameters = [], ?OutputInterface $outputBuffer = null): void
     {
-        Command::call($command, $parameters);
+        Command::call($command, $parameters, $outputBuffer);
     }
 }

src/Contracts/Notification.php

@@ -5,15 +5,15 @@
 namespace DragonCode\LaravelActions\Contracts;
 
 use Closure;
-use Illuminate\Console\OutputStyle;
+use Symfony\Component\Console\Output\OutputInterface;
 
 interface Notification
 {
     public function info(string $string): void;
 
     public function line(string $string, ?string $style = null): void;
 
-    public function setOutput(OutputStyle $output): self;
+    public function setOutput(OutputInterface $output): self;
 
     public function task(string $description, Closure $task): void;
 

src/Notifications/Notification.php

@@ -6,12 +6,11 @@
 
 use Closure;
 use DragonCode\LaravelActions\Contracts\Notification as NotificationContract;
-use Illuminate\Console\OutputStyle;
 use Symfony\Component\Console\Output\OutputInterface;
 
 abstract class Notification implements NotificationContract
 {
-    protected ?OutputStyle $output = null;
+    protected ?OutputInterface $output = null;
 
     protected int $verbosity = OutputInterface::VERBOSITY_NORMAL;
 
@@ -25,7 +24,7 @@ abstract public function task(string $description, Closure $task): void;
 
     abstract public function twoColumn(string $first, string $second): void;
 
-    public function setOutput(OutputStyle $output): NotificationContract
+    public function setOutput(OutputInterface $output): NotificationContract
     {
         $this->output = $output;
 

src/Processors/Migrate.php

@@ -23,7 +23,7 @@ public function handle(): void
 
     protected function ensureRepository(): void
     {
-        $this->artisan(Names::INSTALL, [
+        $this->runCommand(Names::INSTALL, [
             '--' . Options::CONNECTION => $this->options->connection,
             '--' . Options::FORCE      => true,
         ]);

src/Processors/Processor.php

@@ -16,9 +16,9 @@
 use DragonCode\Support\Facades\Helpers\Arr;
 use DragonCode\Support\Facades\Helpers\Str;
 use DragonCode\Support\Filesystem\File;
-use Illuminate\Console\OutputStyle;
 use Illuminate\Contracts\Events\Dispatcher;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 abstract class Processor
 {
@@ -29,7 +29,7 @@ abstract public function handle(): void;
     public function __construct(
         protected Options $options,
         protected InputInterface $input,
-        protected OutputStyle $output,
+        protected OutputInterface $output,
         protected Config $config,
         protected ActionRepository $repository,
         protected Git $git,
@@ -57,7 +57,7 @@ protected function getFiles(string $path, ?Closure $filter = null): array
 
     protected function runCommand(string $command, array $options = []): void
     {
-        $this->artisan($command, array_filter($options));
+        $this->artisan($command, array_filter($options), $this->output);
     }
 
     protected function tableNotFound(): bool

src/Processors/Upgrade.php

@@ -122,7 +122,7 @@ protected function replaceProperties(string $content): string
     protected function moveConfig(): void
     {
         $this->notification->task('Moving config file', function () {
-            $this->artisan('vendor:publish', [
+            $this->runCommand('vendor:publish', [
                 '--provider' => ServiceProvider::class,
                 '--force'    => true,
             ]);
@@ -144,7 +144,7 @@ protected function callMigration(): void
                 ? __DIR__ . '/../../database/migrations/anonymous/2022_08_18_180137_change_migration_actions_table.php'
                 : __DIR__ . '/../../database/migrations/named/2022_08_18_180137_change_migration_actions_table.php';
 
-            $this->artisan('migrate', [
+            $this->runCommand('migrate', [
                 '--path'     => $path,
                 '--realpath' => true,
                 '--force'    => true,

src/Services/Migrator.php

@@ -12,9 +12,9 @@
 use DragonCode\Support\Exceptions\FileNotFoundException;
 use DragonCode\Support\Facades\Helpers\Str;
 use DragonCode\Support\Filesystem\File;
-use Illuminate\Console\OutputStyle;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Support\Facades\DB;
+use Symfony\Component\Console\Output\OutputInterface;
 use Throwable;
 
 class Migrator
@@ -35,7 +35,7 @@ public function setConnection(?string $connection): self
         return $this;
     }
 
-    public function setOutput(OutputStyle $output): self
+    public function setOutput(OutputInterface $output): self
     {
         $this->notification->setOutput($output);