Merge branch 'feature/cleanup'

Author: cboden

.travis.yml

@@ -12,3 +12,6 @@ matrix:
 
 before_script:
   - composer install --dev --prefer-source
+  
+script:
+  - phpunit --coverage-text

CHANGELOG.md

@@ -0,0 +1,36 @@
+# Changelog
+
+## 0.4.0 (2014-02-02)
+
+* BC break: Drop unused `Response::getBody()`
+* BC break: Bump minimum PHP version to PHP 5.4, remove 5.3 specific hacks
+* BC break: Remove `$loop` argument from `HttpClient`: `Client`, `Request`, `Response`
+* BC break: Update to React/Promise 2.0
+* Dependency: Autoloading and filesystem structure now PSR-4 instead of PSR-0
+* Bump React dependencies to v0.4
+
+## 0.3.1 (2013-04-21)
+
+* Bug fix: Correct requirement for socket-client
+
+## 0.3.0 (2013-04-14)
+
+* BC break: Socket connection handling moved to new SocketClient component
+* Bump React dependencies to v0.3
+
+## 0.2.6 (2012-12-26)
+
+* Version bump
+
+## 0.2.5 (2012-11-26)
+
+* Feature: Use a promise-based API internally
+* Bug fix: Use DNS resolver correctly
+
+## 0.2.3 (2012-11-14)
+
+* Version bump
+
+## 0.2.2 (2012-10-28)
+
+* Feature: HTTP client (@arnaud-lb)

composer.json

@@ -7,7 +7,10 @@
         "php": ">=5.4.0",
         "guzzle/parser": "~3.0",
         "react/socket-client": "0.4.*",
-        "react/dns": "0.4.*"
+        "react/dns": "0.4.*",
+        "react/event-loop": "0.4.*",
+        "react/stream": "0.4.*",
+        "evenement/evenement": "~2.0"
     },
     "autoload": {
         "psr-4": {

src/Client.php

@@ -2,32 +2,29 @@
 
 namespace React\HttpClient;
 
-use React\EventLoop\LoopInterface;
-use React\HttpClient\Request;
 use React\SocketClient\ConnectorInterface;
 
 class Client
 {
-    private $connectionManager;
-    private $secureConnectionManager;
+    private $connector;
+    private $secureConnector;
 
     public function __construct(ConnectorInterface $connector, ConnectorInterface $secureConnector)
     {
         $this->connector = $connector;
         $this->secureConnector = $secureConnector;
     }
 
-    public function request($method, $url, array $headers = array())
+    public function request($method, $url, array $headers = [])
     {
         $requestData = new RequestData($method, $url, $headers);
-        $connectionManager = $this->getConnectorForScheme($requestData->getScheme());
-        return new Request($connectionManager, $requestData);
+        $connector = $this->getConnectorForScheme($requestData->getScheme());
 
+        return new Request($connector, $requestData);
     }
 
     private function getConnectorForScheme($scheme)
     {
         return ('https' === $scheme) ? $this->secureConnector : $this->connector;
     }
 }
-

src/Factory.php

@@ -13,7 +13,7 @@ public function create(LoopInterface $loop, Resolver $resolver)
     {
         $connector = new Connector($loop, $resolver);
         $secureConnector = new SecureConnector($connector, $loop);
+
         return new Client($connector, $secureConnector);
     }
 }
-

src/Request.php

@@ -2,21 +2,22 @@
 
 namespace React\HttpClient;
 
-use Evenement\EventEmitter;
+use Evenement\EventEmitterTrait;
 use Guzzle\Parser\Message\MessageParser;
-use React\EventLoop\LoopInterface;
-use React\HttpClient\Response;
-use React\HttpClient\ResponseHeaderParser;
 use React\SocketClient\ConnectorInterface;
-use React\Stream\Stream;
 use React\Stream\WritableStreamInterface;
 
 /**
  * @event headers-written
  * @event response
+ * @event drain
+ * @event error
+ * @event end
  */
-class Request extends EventEmitter implements WritableStreamInterface
+class Request implements WritableStreamInterface
 {
+    use EventEmitterTrait;
+
     const STATE_INIT = 0;
     const STATE_WRITING_HEAD = 1;
     const STATE_HEAD_WRITTEN = 2;
@@ -244,4 +245,3 @@ public function getResponseFactory()
         return $factory;
     }
 }
-

src/RequestData.php

@@ -10,7 +10,7 @@ class RequestData
 
     private $protocolVersion = '1.1';
 
-    public function __construct($method, $url, array $headers = array())
+    public function __construct($method, $url, array $headers = [])
     {
         $this->method = $method;
         $this->url = $url;

src/Response.php

@@ -2,15 +2,21 @@
 
 namespace React\HttpClient;
 
-use Evenement\EventEmitter;
-use React\EventLoop\LoopInterface;
+use Evenement\EventEmitterTrait;
 use React\Stream\ReadableStreamInterface;
 use React\Stream\Stream;
 use React\Stream\Util;
 use React\Stream\WritableStreamInterface;
 
-class Response extends EventEmitter implements ReadableStreamInterface
+/**
+ * @event data
+ * @event error
+ * @event end
+ */
+class Response implements ReadableStreamInterface
 {
+    use EventEmitterTrait;
+
     private $stream;
     private $protocol;
     private $version;
@@ -116,11 +122,10 @@ public function resume()
         $this->stream->resume();
     }
 
-    public function pipe(WritableStreamInterface $dest, array $options = array())
+    public function pipe(WritableStreamInterface $dest, array $options = [])
     {
         Util::pipe($this, $dest, $options);
 
         return $dest;
     }
 }
-