Merge pull request #96 from TheDragonCode/3.x

Renamed `silent` option with `mute`

Author: andrey-helldar

src/Concerns/Optionable.php

@@ -17,7 +17,7 @@ trait Optionable
     protected array $options = [
         Options::CONNECTION,
         Options::FORCE,
-        Options::SILENT,
+        Options::MUTE,
     ];
 
     protected function configure(): void
@@ -48,7 +48,7 @@ protected function availableOptions(): array
             [Options::PATH, null, InputOption::VALUE_OPTIONAL, 'The path to the actions files to be executed'],
             [Options::REALPATH, null, InputOption::VALUE_NONE, 'Indicate any provided action file paths are pre-resolved absolute path'],
             [Options::STEP, null, InputOption::VALUE_OPTIONAL, 'Force the actions to be run so they can be rolled back individually'],
-            [Options::SILENT, null, InputOption::VALUE_NONE, 'Turns off the output of informational messages'],
+            [Options::MUTE, null, InputOption::VALUE_NONE, 'Turns off the output of informational messages'],
         ];
     }
 

src/Console/Fresh.php

@@ -22,6 +22,6 @@ class Fresh extends Command
         Options::FORCE,
         Options::PATH,
         Options::REALPATH,
-        Options::SILENT,
+        Options::MUTE,
     ];
 }

src/Console/Make.php

@@ -24,6 +24,6 @@ class Make extends Command
         Options::FORCE,
         Options::PATH,
         Options::REALPATH,
-        Options::SILENT,
+        Options::MUTE,
     ];
 }

src/Console/Migrate.php

@@ -22,6 +22,6 @@ class Migrate extends Command
         Options::CONNECTION,
         Options::PATH,
         Options::REALPATH,
-        Options::SILENT,
+        Options::MUTE,
     ];
 }

src/Console/Refresh.php

@@ -20,6 +20,6 @@ class Refresh extends Command
         Options::FORCE,
         Options::PATH,
         Options::REALPATH,
-        Options::SILENT,
+        Options::MUTE,
     ];
 }

src/Console/Reset.php

@@ -20,6 +20,6 @@ class Reset extends Command
         Options::FORCE,
         Options::PATH,
         Options::REALPATH,
-        Options::SILENT,
+        Options::MUTE,
     ];
 }

src/Console/Rollback.php

@@ -21,6 +21,6 @@ class Rollback extends Command
         Options::PATH,
         Options::REALPATH,
         Options::STEP,
-        Options::SILENT,
+        Options::MUTE,
     ];
 }

src/Console/Status.php

@@ -21,6 +21,6 @@ class Status extends Command
         Options::CONNECTION,
         Options::PATH,
         Options::REALPATH,
-        Options::SILENT,
+        Options::MUTE,
     ];
 }

src/Constants/Options.php

@@ -12,13 +12,13 @@ class Options
 
     public const FORCE = 'force';
 
+    public const MUTE = 'mute';
+
     public const NAME = 'name';
 
     public const PATH = 'path';
 
     public const REALPATH = 'realpath';
 
-    public const SILENT = 'silent';
-
     public const STEP = 'step';
 }

src/Notifications/Beautiful.php

@@ -6,43 +6,52 @@
 
 use Closure;
 use Illuminate\Console\View\Components\Factory;
-use Illuminate\Support\Optional;
 
 class Beautiful extends Notification
 {
-    protected Factory|Optional|null $components = null;
+    protected ?Factory $components = null;
 
     public function line(string $string, ?string $style = null): void
     {
-        $this->components()->line($style, $string, $this->verbosity);
+        if ($this->canSpeak()) {
+            $this->components()->line($style, $string, $this->verbosity);
+        }
     }
 
     public function info(string $string): void
     {
-        $this->components()->info($string, $this->verbosity);
+        if ($this->canSpeak()) {
+            $this->components()->info($string, $this->verbosity);
+        }
     }
 
     public function warning(string $string): void
     {
-        $this->components()->warn($string, $this->verbosity);
+        if ($this->canSpeak()) {
+            $this->components()->warn($string, $this->verbosity);
+        }
     }
 
     public function task(string $description, Closure $task): void
     {
-        $this->components()->task($description, $task);
+        if ($this->canSpeak()) {
+            $this->components()->task($description, $task);
+        }
     }
 
     public function twoColumn(string $first, string $second): void
     {
-        $this->components()->twoColumnDetail($first, $second, $this->verbosity);
+        if ($this->canSpeak()) {
+            $this->components()->twoColumnDetail($first, $second, $this->verbosity);
+        }
     }
 
-    protected function components(): Factory|Optional
+    protected function components(): Factory
     {
         if (! is_null($this->components)) {
             return $this->components;
         }
 
-        return $this->component = $this->canSpeak() ? new Factory($this->output) : optional();
+        return $this->components = new Factory($this->output);
     }
 }