Merge pull request #14 from alexkart/codex/find-and-fix-a-bug-in-codebase

Fix duplicate options handling

Author: alexkart

src/Command.php

@@ -339,15 +339,18 @@ private function toInternalFormat(array $options): array
         $formattedOptions = [];
         foreach ($options as $option => $arguments) {
             $option = trim((string)$option);
+
             if (strpos($option, '-') !== 0) {
                 // ['-L', '-v']
-                $formattedOptions[$arguments] = [null];
+                $option = (string)$arguments;
+                $arguments = [null];
             } elseif (!is_array($arguments)) {
                 // ['-L' => null, '-v' => null]
-                $formattedOptions[$option] = [$arguments];
-            } else {
-                // internal format
-                $formattedOptions[$option] = $arguments;
+                $arguments = [$arguments];
+            }
+
+            foreach ($arguments as $argument) {
+                $formattedOptions[$option][] = $argument;
             }
         }
 

tests/CommandTest.php

@@ -97,6 +97,20 @@ public function testBuildDuplicatedOptions(): void
         $this->assertSame('curl -v -L -L http://example.com', $command->build());
     }
 
+    public function testBuildDuplicatedOptionsAddOptions(): void
+    {
+        $command = $this->getNewCommand();
+        $command->addOptions(['-v', '-v']);
+        $this->assertSame('curl -v -v http://example.com', $command->build());
+    }
+
+    public function testBuildDuplicatedOptionsSetOptions(): void
+    {
+        $command = $this->getNewCommand();
+        $command->setOptions(['-v', '-v']);
+        $this->assertSame('curl -v -v http://example.com', $command->build());
+    }
+
     public function testBuildSetTemplate(): void
     {
         $command = $this->getNewCommand();