Merge branch 'refs/heads/replace-guzzle-http' into 0.3

Conflicts:
	composer.lock

Author: cboden

Client.php

@@ -2,18 +2,15 @@
 
 namespace React\HttpClient;
 
-use Guzzle\Http\Message\Request as GuzzleRequest;
 use React\EventLoop\LoopInterface;
 use React\HttpClient\ConnectionManager;
-use React\HttpClient\Request as ClientRequest;
+use React\HttpClient\Request;
 use React\HttpClient\SecureConnectionManager;
 
 class Client
 {
     private $loop;
-
     private $connectionManager;
-
     private $secureConnectionManager;
 
     public function __construct(LoopInterface $loop, ConnectionManagerInterface $connectionManager, ConnectionManagerInterface $secureConnectionManager)
@@ -25,9 +22,9 @@ public function __construct(LoopInterface $loop, ConnectionManagerInterface $con
 
     public function request($method, $url, array $headers = array())
     {
-        $guzzleRequest = new GuzzleRequest($method, $url, $headers);
-        $connectionManager = $this->getConnectionManagerForScheme($guzzleRequest->getScheme());
-        return new ClientRequest($this->loop, $connectionManager, $guzzleRequest);
+        $requestData = new RequestData($method, $url, $headers);
+        $connectionManager = $this->getConnectionManagerForScheme($requestData->getScheme());
+        return new Request($this->loop, $connectionManager, $requestData);
     }
 
     public function setConnectionManager(ConnectionManagerInterface $connectionManager)

Request.php

@@ -3,8 +3,6 @@
 namespace React\HttpClient;
 
 use Evenement\EventEmitter;
-use Guzzle\Http\Message\Request as GuzzleRequest;
-use Guzzle\Http\Url;
 use Guzzle\Parser\Message\MessageParser;
 use React\EventLoop\LoopInterface;
 use React\HttpClient\ConnectionManagerInterface;
@@ -24,20 +22,21 @@ class Request extends EventEmitter implements WritableStreamInterface
     const STATE_HEAD_WRITTEN = 2;
     const STATE_END = 3;
 
-    private $request;
     private $loop;
     private $connectionManager;
+    private $requestData;
+
     private $stream;
     private $buffer;
     private $responseFactory;
     private $response;
     private $state = self::STATE_INIT;
 
-    public function __construct(LoopInterface $loop, ConnectionManagerInterface $connectionManager, GuzzleRequest $request)
+    public function __construct(LoopInterface $loop, ConnectionManagerInterface $connectionManager, RequestData $requestData)
     {
         $this->loop = $loop;
         $this->connectionManager = $connectionManager;
-        $this->request = $request;
+        $this->requestData = $requestData;
     }
 
     public function isWritable()
@@ -54,23 +53,23 @@ public function writeHead()
         $this->state = self::STATE_WRITING_HEAD;
 
         $that = $this;
-        $request = $this->request;
+        $requestData = $this->requestData;
         $streamRef = &$this->stream;
         $stateRef = &$this->state;
 
         $this
             ->connect()
             ->then(
-                function ($stream) use ($that, $request, &$streamRef, &$stateRef) {
+                function ($stream) use ($that, $requestData, &$streamRef, &$stateRef) {
                     $streamRef = $stream;
 
                     $stream->on('drain', array($that, 'handleDrain'));
                     $stream->on('data', array($that, 'handleData'));
                     $stream->on('end', array($that, 'handleEnd'));
                     $stream->on('error', array($that, 'handleError'));
 
-                    $request->setProtocolVersion('1.0');
-                    $headers = (string) $request;
+                    $requestData->setProtocolVersion('1.0');
+                    $headers = (string) $requestData;
 
                     $stream->write($headers);
 
@@ -215,8 +214,8 @@ protected function parseResponse($data)
 
     protected function connect()
     {
-        $host = $this->request->getHost();
-        $port = $this->request->getPort();
+        $host = $this->requestData->getHost();
+        $port = $this->requestData->getPort();
 
         return $this->connectionManager
             ->getConnection($host, $port);

RequestData.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace React\HttpClient;
+
+class RequestData
+{
+    private $method;
+    private $url;
+    private $headers;
+
+    private $protocolVersion = '1.1';
+
+    public function __construct($method, $url, array $headers = array())
+    {
+        $this->method = $method;
+        $this->url = $url;
+        $this->headers = $headers;
+    }
+
+    private function mergeDefaultheaders(array $headers)
+    {
+        $port = ($this->getDefaultPort() === $this->getPort()) ? '' : ":{$this->getPort()}";
+        $connectionHeaders = ('1.1' === $this->protocolVersion) ? array('Connection' => 'close') : array();
+
+        return array_merge(
+            array(
+                'Host'          => $this->getHost().$port,
+                'User-Agent'    => 'React/alpha',
+            ),
+            $connectionHeaders,
+            $headers
+        );
+    }
+
+    public function getScheme()
+    {
+        return parse_url($this->url, PHP_URL_SCHEME);
+    }
+
+    public function getHost()
+    {
+        return parse_url($this->url, PHP_URL_HOST);
+    }
+
+    public function getPort()
+    {
+        return (int) parse_url($this->url, PHP_URL_PORT) ?: $this->getDefaultPort();
+    }
+
+    public function getDefaultPort()
+    {
+        return ('https' === $this->getScheme()) ? 443 : 80;
+    }
+
+    public function getPath()
+    {
+        $path = parse_url($this->url, PHP_URL_PATH) ?: '/';
+        $queryString = parse_url($this->url, PHP_URL_QUERY);
+
+        return $path.($queryString ? "?$queryString" : '');
+    }
+
+    public function setProtocolVersion($version)
+    {
+        $this->protocolVersion = $version;
+    }
+
+    public function __toString()
+    {
+        $headers = $this->mergeDefaultheaders($this->headers);
+
+        $data = '';
+        $data .= "{$this->method} {$this->getPath()} HTTP/{$this->protocolVersion}\r\n";
+        foreach ($headers as $name => $value) {
+            $data .= "$name: $value\r\n";
+        }
+        $data .= "\r\n";
+
+        return $data;
+    }
+}

composer.json

@@ -5,7 +5,6 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3.3",
-        "guzzle/http": "2.8.*",
         "guzzle/parser": "2.8.*",
         "react/socket": "0.3.*",
         "react/dns": "0.3.*"