Merge pull request #98 from clue-labs/options-asterisk

Support OPTIONS method with asterisk-form (OPTIONS * HTTP/1.1)

Author: WyriHaximus

src/RequestData.php

@@ -56,10 +56,18 @@ public function getDefaultPort()
 
     public function getPath()
     {
-        $path = parse_url($this->url, PHP_URL_PATH) ?: '/';
+        $path = parse_url($this->url, PHP_URL_PATH);
         $queryString = parse_url($this->url, PHP_URL_QUERY);
 
-        return $path.($queryString ? "?$queryString" : '');
+        // assume "/" path by default, but allow "OPTIONS *"
+        if ($path === null) {
+            $path = ($this->method === 'OPTIONS' && $queryString === null) ? '*': '/';
+        }
+        if ($queryString !== null) {
+            $path .= '?' . $queryString;
+        }
+
+        return $path;
     }
 
     public function setProtocolVersion($version)

tests/RequestDataTest.php

@@ -19,6 +19,58 @@ public function toStringReturnsHTTPRequestMessage()
         $this->assertSame($expected, $requestData->__toString());
     }
 
+    /** @test */
+    public function toStringReturnsHTTPRequestMessageWithEmptyQueryString()
+    {
+        $requestData = new RequestData('GET', 'http://www.example.com/path?hello=world');
+
+        $expected = "GET /path?hello=world HTTP/1.0\r\n" .
+            "Host: www.example.com\r\n" .
+            "User-Agent: React/alpha\r\n" .
+            "\r\n";
+
+        $this->assertSame($expected, $requestData->__toString());
+    }
+
+    /** @test */
+    public function toStringReturnsHTTPRequestMessageWithZeroQueryStringAndRootPath()
+    {
+        $requestData = new RequestData('GET', 'http://www.example.com?0');
+
+        $expected = "GET /?0 HTTP/1.0\r\n" .
+            "Host: www.example.com\r\n" .
+            "User-Agent: React/alpha\r\n" .
+            "\r\n";
+
+        $this->assertSame($expected, $requestData->__toString());
+    }
+
+    /** @test */
+    public function toStringReturnsHTTPRequestMessageWithOptionsAbsoluteRequestForm()
+    {
+        $requestData = new RequestData('OPTIONS', 'http://www.example.com/');
+
+        $expected = "OPTIONS / HTTP/1.0\r\n" .
+            "Host: www.example.com\r\n" .
+            "User-Agent: React/alpha\r\n" .
+            "\r\n";
+
+        $this->assertSame($expected, $requestData->__toString());
+    }
+
+    /** @test */
+    public function toStringReturnsHTTPRequestMessageWithOptionsAsteriskRequestForm()
+    {
+        $requestData = new RequestData('OPTIONS', 'http://www.example.com');
+
+        $expected = "OPTIONS * HTTP/1.0\r\n" .
+            "Host: www.example.com\r\n" .
+            "User-Agent: React/alpha\r\n" .
+            "\r\n";
+
+        $this->assertSame($expected, $requestData->__toString());
+    }
+
     /** @test */
     public function toStringReturnsHTTPRequestMessageWithProtocolVersion()
     {