* Fixed response headers parsing

* Implements HEAD and POST (first draft)

Author: matricali

composer.json

@@ -4,6 +4,7 @@
     "type": "library",
     "keywords": ["http", "client", "psr7", "curl", "wrapper"],
     "require": {
+        "php": ">=5.4.0",
         "psr/http-message": "^1.0"
     },
     "require-dev": {

src/Client.php

@@ -35,6 +35,8 @@ class Client
     protected $handle = null;
     protected $responseHeader = '';
     protected $responseHeaders = [];
+    protected $statusCode;
+    protected $version;
 
     public function __construct()
     {
@@ -78,6 +80,7 @@ public function __clone()
 
     protected function parseHeaders($lines)
     {
+
         if (empty($lines)) {
             return [];
         }
@@ -86,12 +89,13 @@ protected function parseHeaders($lines)
         } elseif (!is_array($lines)) {
             return false;
         }
+
         $status = [];
         if (preg_match('%^HTTP/(\d(?:\.\d)?)\s+(\d{3})\s?+(.+)?$%i', $lines[0], $status)) {
-            $this->status = array_shift($lines);
-            $this->version = $lines[1];
-            $this->statusCode = intval($lines[2]);
-            $this->statusMessage = isset($lines[3]) ? $lines[3] : '';
+            $this->status = $status[0];
+            $this->version = $status[1];
+            $this->statusCode = intval($status[2]);
+            $this->statusMessage = isset($status[3]) ? $status[3] : '';
         }
 
         foreach ($lines as $field) {
@@ -110,6 +114,21 @@ public function sendRequest(RequestInterface $request)
         curl_setopt($this->handle, CURLOPT_URL, (string) $request->getUri());
         curl_setopt($this->handle, CURLOPT_HEADERFUNCTION, [$this, 'headerFunction']);
 
+        if ($request->getMethod() == 'HEAD') {
+            curl_setopt($this->handle, CURLOPT_NOBODY, true);
+        }
+
+        if ($request->getMethod() == 'POST') {
+            curl_setopt($this->handle, CURLOPT_POST, true);
+            if (!empty($request->getBody())) {
+                curl_setopt($this->handle, CURLOPT_POSTFIELDS, $request->getBody());
+            }
+        }
+
+        if (in_array($request->getMethod(), ['PUT', 'PATCH', 'DELETE'])) {
+            curl_setopt($this->handle, CURLOPT_CUSTOMREQUEST, $request->getMethod());
+        }
+
         $ret = curl_exec($this->handle);
 
         if ($errno = curl_errno($this->handle)) {
@@ -118,14 +137,26 @@ public function sendRequest(RequestInterface $request)
 
         $this->parseHeaders($this->responseHeader);
 
-        $response = new Response($ret, $this->statusCode, $this->responseHeaders);
+        $response = new Response($ret, $this->statusCode, $this->responseHeaders, $this->version);
         return $response;
     }
 
     public function get($uri, $headers = [])
     {
         $request = new Request('GET', $uri, $headers);
-        print_r($request);
+        return $this->sendRequest($request);
+    }
+
+    public function head($uri, $headers = [])
+    {
+        $request = new Request('HEAD', $uri, $headers);
+        return $this->sendRequest($request);
+    }
+
+    public function post($uri, $body = '', $headers = [])
+    {
+        $request = new Request('POST', $uri, $headers);
+        $request->setBody($body);
         return $this->sendRequest($request);
     }
 }

src/Request.php

@@ -361,6 +361,13 @@ public function getBody()
     {
         return $this->body;
     }
+
+    public function setBody($body)
+    {
+        $this->body = $body;
+        return $this;
+    }
+
     /**
      * Return an instance with the specified message body.
      *

src/Response.php

@@ -45,9 +45,13 @@
 class Response implements ResponseInterface
 {
     protected $statusCode;
+    protected $protocolVersion;
+    protected $headers;
+    protected $body;
 
-    public function __construct($body, $statusCode = 200, $headers = [])
+    public function __construct($body, $statusCode = 200, $headers = [], $protocolVersion = '1.1')
     {
+        $this->protocolVersion = $protocolVersion;
         $this->body = $body;
         $this->statusCode = $statusCode;
         $this->headers = $headers;

tests/ClientTest.php

@@ -30,10 +30,33 @@
  */
 class ClientTest extends TestCase
 {
-    public function testEmptyUri()
+    public function testBasicGet()
     {
         $client = new Client();
-        $response = $client->get('https://www.google.com/');
-        $this->assertEquals(200, $response->getStatusCode());
+        $response = $client->get('http://www.google.com/');
+        $this->assertEquals(302, $response->getStatusCode());
+        $this->assertContains('private', $response->getHeader('Cache-Control'));
+        $this->assertEquals('1.1', $response->getProtocolVersion());
+        $this->assertNotEmpty($response->getBody());
+    }
+
+    public function testBasicHead()
+    {
+        $client = new Client();
+        $response = $client->head('http://www.google.com/');
+        $this->assertEquals(302, $response->getStatusCode());
+        $this->assertContains('private', $response->getHeader('Cache-Control'));
+        $this->assertEquals('1.1', $response->getProtocolVersion());
+        $this->assertEmpty($response->getBody());
+    }
+
+    public function testBasicPost()
+    {
+        $client = new Client();
+        $response = $client->post('http://www.google.com/', 'test=test&a=b');
+        $this->assertEquals(405, $response->getStatusCode());
+        // $this->assertContains('private', $response->getHeader('Cache-Control'));
+        $this->assertEquals('1.1', $response->getProtocolVersion());
+        $this->assertNotEmpty($response->getBody());
     }
 }