Handle NULL Values in expandOptionsManually and expandOptions Functions

tmuras · Jul 31, 2023 · 3c90cae · 3c90cae
1 parent 031b871
commit 3c90cae
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Moosh/MooshCommand.php b/Moosh/MooshCommand.php
@@ -251,6 +251,9 @@ public function expandOptions() {
             //TODO handle %%
             $current_options = array();
             foreach ($this->expandedOptions as $k => $v) {
+                if ($v === null) {
+                    $v = '';
+                }
                 $expanded = str_replace('%s', $arg, $v);
                 if ($this->verbose && $v != $expanded) {
                     echo "'$k' expanded from '$v' to '$expanded'\n";
@@ -271,6 +274,9 @@ public function expandOptionsManually($replacements) {
             //process all options
             //TODO handle %%
             foreach ($this->expandedOptions as $k => $v) {
+                if ($v === null) {
+                    $v = '';
+                }
                 $expanded = str_replace('%s', $arg, $v);
                 if ($this->verbose && $v != $expanded) {
                     echo "'$k' manually expanded from '$v' to '$expanded'\n";