fixing the bug with the missing last param

stdakov · Dec 21, 2019 · 9bda08f · 9bda08f
1 parent 09fd905
commit 9bda08f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/example/script.php b/example/script.php
@@ -1,6 +1,6 @@
 <?php
 
-//php script.php command subCommand -a value1 -bc 'value2' --param1 value3 --param2 --pa "value4" --vk value5
+//php script.php command subCommand -a value1 -bc 'value2' --param1 value3 --param2 --pa "value4" --vk value5 -d
 
 chdir(dirname(dirname(__FILE__)));
 
@@ -51,4 +51,9 @@ function dd($a)
     throw new Exception("Missing or wrong paramerter");
 }
 
+if ($terminal->getParameter("d") !== true) {
+    throw new Exception("Missing or wrong paramerter");
+}
+
+
 dd($terminal->getParams());
diff --git a/src/Request.php b/src/Request.php
@@ -81,9 +81,9 @@ public function setParameter($name, $value)
             throw new \InvalidArgumentException("Wrong parameter name '" . $name . "'");
         }
 
-        if (array_key_exists($name, $this->params)) {
-            throw new \InvalidArgumentException("Parameter name '" . $name . "' has already been set");
-        }
+        // if (array_key_exists($name, $this->params)) {
+        //     throw new \InvalidArgumentException("Parameter name '" . $name . "' has already been set");
+        // }
 
         $this->params[$name] = $value;
 
@@ -168,12 +168,9 @@ protected function parseParams($arguments)
         foreach ($arguments as $argument) {
 
             if (strpos($argument, "-") === 0) {
-                if ($currentParamName != null) {
-                    $this->setParameter($currentParamName, true);
-                }
 
                 $currentParamName = ltrim(trim($argument), '-');
-
+                $this->setParameter($currentParamName, true);
 
                 if (strpos($argument, "--") === 0) {
                     if (strlen($currentParamName) < 2) {