#13: Remove HeaderParser

Author: mekras

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## Unreleased
+
+### Removed
+
+- #13: Remove HeaderParser. 
+
+
 ## 1.1.0 - 2016-01-29
 
 ### Changed

composer.json

@@ -21,7 +21,7 @@
     "require-dev": {
         "guzzlehttp/psr7": "^1.0",
         "php-http/adapter-integration-tests": "dev-master#836cdff8294174cceeae54601ab4079c309227b7",
-        "php-http/message": "^1.0",
+        "php-http/message": "dev-master",
         "phpunit/phpunit": "^4.8",
         "zendframework/zend-diactoros": "^1.0"
     },

src/ResponseParser.php

@@ -1,7 +1,7 @@
 <?php
 namespace Http\Client\Curl;
 
-use Http\Client\Curl\Tools\HeadersParser;
+use Http\Message\Builder\ResponseBuilder;
 use Http\Message\MessageFactory;
 use Http\Message\StreamFactory;
 use Psr\Http\Message\ResponseInterface;
@@ -50,6 +50,7 @@ public function __construct(MessageFactory $messageFactory, StreamFactory $strea
      * @return ResponseInterface
      *
      * @throws \InvalidArgumentException
+     * @throws \UnexpectedValueException
      * @throws \RuntimeException
      */
     public function parse($raw, array $info)
@@ -59,8 +60,9 @@ public function parse($raw, array $info)
         $headerSize = $info['header_size'];
         $rawHeaders = substr($raw, 0, $headerSize);
 
-        $parser = new HeadersParser();
-        $response = $parser->parseString($rawHeaders, $response);
+        $builder = new ResponseBuilder($response);
+        $builder->setHeadersFromString($rawHeaders);
+        $response = $builder->getResponse();
 
         /*
          * substr can return boolean value for empty string. But createStream does not support