Merge pull request #18 from alexkart/codex/review-tests-and-add-missing-cases

Improve test coverage

Author: alexkart

README.md

@@ -119,4 +119,8 @@ $command->setQuoteCharacter(Command::QUOTE_DOUBLE);
 $command->addOption('-d', 'data');
 $command->setQuoteCharacter(Command::QUOTE_NONE);
 // curl -d data
+
+$command->addOption('-d', 'value with spaces');
+$command->setQuoteCharacter(Command::QUOTE_NONE);
+// curl -d value\ with\ spaces
 ``` 

src/Command.php

@@ -305,15 +305,15 @@ private function quote(string $argument): string
         $quoteCharacter = $this->getQuoteCharacter();
 
         if ($quoteCharacter === '') {
-            return $argument;
+            return $this->escapeSpaces($argument);
         }
 
         if (strpos($argument, $quoteCharacter) !== false) {
             if ($quoteCharacter === self::QUOTE_SINGLE) {
-                return '$' . $quoteCharacter . $this->escape($argument) . $quoteCharacter;
+                return '$' . $quoteCharacter . $this->escapeQuotes($argument) . $quoteCharacter;
             }
 
-            return $quoteCharacter . $this->escape($argument) . $quoteCharacter;
+            return $quoteCharacter . $this->escapeQuotes($argument) . $quoteCharacter;
         }
 
         return $quoteCharacter . $argument . $quoteCharacter;
@@ -324,11 +324,21 @@ private function quote(string $argument): string
      * @param string $argument
      * @return string
      */
-    private function escape(string $argument): string
+    private function escapeQuotes(string $argument): string
     {
         return str_replace($this->getQuoteCharacter(), '\\' . $this->getQuoteCharacter(), $argument);
     }
 
+    /**
+     * Escapes spaces in the argument when no quoting is used
+     * @param string $argument
+     * @return string
+     */
+    private function escapeSpaces(string $argument): string
+    {
+        return str_replace(' ', '\\ ', $argument);
+    }
+
     /**
      * Converts option from user-friendly format ot internal format
      * @param array<mixed> $options

tests/CommandTest.php

@@ -308,4 +308,24 @@ public function testBuildParseRequest(): void
         $command->setRequest($request);
         $this->assertTrue($command->parseRequest());
     }
+
+    public function testBuildPsrHttpRequestSkipHostHeader(): void
+    {
+        $request = new Request('GET', 'http://example.com', [
+            'Host' => ['example.com'],
+            'Custom' => ['value'],
+        ]);
+
+        $command = new Command();
+        $command->setRequest($request);
+        $this->assertSame("curl -H 'Custom: value' http://example.com", $command->build());
+    }
+
+    public function testBuildWithQuoteNoneAndSpaces(): void
+    {
+        $command = $this->getNewCommand();
+        $command->setQuoteCharacter(Command::QUOTE_NONE);
+        $command->addOption('-d', 'value with spaces');
+        $this->assertSame('curl -d value\\ with\\ spaces http://example.com', $command->build());
+    }
 }