Add flag: valueEscape to option methods

Author: ArtARTs36

src/Concerns/HasSettings.php

@@ -72,16 +72,19 @@ public function addCutOption(string $option): ShellCommandInterface
         return $this;
     }
 
-    public function addCutOptionWithValue(string $option, string $value): ShellCommandInterface
-    {
-        $this->addSetting(new CutOption($option, $value));
+    public function addCutOptionWithValue(
+        string $option,
+        string $value,
+        bool $valueEscape = false
+    ): ShellCommandInterface {
+        $this->addSetting(new CutOption($option, $value, $valueEscape));
 
         return $this;
     }
 
-    public function addOptionWithValue(string $option, string $value): ShellCommandInterface
+    public function addOptionWithValue(string $option, string $value, bool $valueEscape = false): ShellCommandInterface
     {
-        $this->addSetting(new Option($option, $value));
+        $this->addSetting(new Option($option, $value, $valueEscape));
 
         return $this;
     }

src/Interfaces/ShellCommandInterface.php

@@ -49,12 +49,12 @@ public function addCutOption(string $option): self;
      * Add cut option with value into command line
      * @return $this
      */
-    public function addCutOptionWithValue(string $option, string $value): self;
+    public function addCutOptionWithValue(string $option, string $value, bool $valueEscape = false): self;
 
     /**
      * Add option with value into command line
      */
-    public function addOptionWithValue(string $option, string $value): self;
+    public function addOptionWithValue(string $option, string $value, bool $valueEscape = false): self;
 
     /**
      * @return string

src/Settings/CutOption.php

@@ -5,9 +5,4 @@
 class CutOption extends Option
 {
     protected static $prefix = '-';
-
-    public function __toString(): string
-    {
-        return '-'. $this->option . ($this->value ? '=' . $this->value : '');
-    }
 }

src/Settings/Option.php

@@ -12,15 +12,18 @@ class Option implements ShellSettingInterface
 
     protected $value;
 
-    public function __construct(string $option, ?string $value = null)
+    protected $valueEscape;
+
+    public function __construct(string $option, ?string $value = null, bool $valueEscape = false)
     {
         $this->option = $option;
         $this->value = $value;
+        $this->valueEscape = $valueEscape;
     }
 
     public function __toString(): string
     {
-        return '--'. $this->option . ($this->value ? '=' . $this->value : '');
+        return static::$prefix. $this->option . ($this->value ? '=' . $this->valueToString() : '');
     }
 
     public static function is(string $raw): bool
@@ -46,4 +49,13 @@ public static function explodeAttributesFromRaw(string $raw): array
 
         return explode('=', $raw);
     }
+
+    protected function valueToString(): string
+    {
+        if ($this->value === null) {
+            return '';
+        }
+
+        return $this->valueEscape ? escapeshellarg($this->value) : $this->value;
+    }
 }