[http client] code style

Author: arnaud-lb

Client.php

@@ -2,11 +2,11 @@
 
 namespace React\Http;
 
+use Guzzle\Http\Message\Request as GuzzleRequest;
 use React\EventLoop\LoopInterface;
 use React\Http\Client\ConnectionManager;
-use React\Http\Client\SecureConnectionManager;
-use Guzzle\Http\Message\Request as GuzzleRequest;
 use React\Http\Client\Request as ClientRequest;
+use React\Http\Client\SecureConnectionManager;
 
 class Client
 {

Client/ConnectionManager.php

@@ -35,7 +35,7 @@ public function getConnection($callback, $host, $port)
         $loop = $this->loop;
         $that = $this;
 
-        $this->loop->addWriteStream($socket, function() use ($that, $callback, $socket, $loop) {
+        $this->loop->addWriteStream($socket, function () use ($that, $callback, $socket, $loop) {
 
             $loop->removeWriteStream($socket);
 

Client/Request.php

@@ -3,19 +3,18 @@
 namespace React\Http\Client;
 
 use Evenement\EventEmitter;
-use Guzzle\Http\Url;
-use React\Stream\Stream;
 use Guzzle\Http\Message\Request as GuzzleRequest;
-use React\Http\Client\Response;
-use React\EventLoop\LoopInterface;
+use Guzzle\Http\Url;
 use Guzzle\Parser\Message\MessageParser;
+use React\EventLoop\LoopInterface;
 use React\Http\Client\ConnectionManagerInterface;
+use React\Http\Client\Response;
 use React\Http\Client\ResponseHeaderParser;
+use React\Stream\Stream;
 use React\Stream\WritableStreamInterface;
 
 class Request extends EventEmitter implements WritableStreamInterface
 {
-
     const STATE_INIT = 0;
     const STATE_WRITING_HEAD = 1;
     const STATE_HEAD_WRITTEN = 2;
@@ -45,7 +44,7 @@ public function isWritable()
     public function writeHead()
     {
         if (self::STATE_WRITING_HEAD <= $this->state) {
-            throw new \LogicException('headers already written');
+            throw new \LogicException('Headers already written');
         }
 
         $this->state = self::STATE_WRITING_HEAD;
@@ -55,10 +54,10 @@ public function writeHead()
         $streamRef = &$this->stream;
         $stateRef = &$this->state;
 
-        $this->connect(function($stream, \Exception $error = null) use ($that, $request, &$streamRef, &$stateRef) {
+        $this->connect(function ($stream, \Exception $error = null) use ($that, $request, &$streamRef, &$stateRef) {
             if (!$stream) {
                 $that->closeError(new \RuntimeException(
-                    "connection failed",
+                    "Connection failed",
                     0,
                     $error
                 ));
@@ -93,7 +92,7 @@ public function write($data)
             return $this->stream->write($data);
         }
 
-        $this->on('headers-written', function($that) use ($data) {
+        $this->on('headers-written', function ($that) use ($data) {
             $that->write($data);
         });
 
@@ -127,8 +126,7 @@ public function handleData($data)
         $this->buffer .= $data;
 
         if (false !== strpos($this->buffer, "\r\n\r\n")) {
-
-            list($response, $body) = $this->parseResponse($this->buffer);
+            list($response, $bodyChunk) = $this->parseResponse($this->buffer);
 
             $this->stream->removeListener('drain', array($this, 'handleDrain'));
             $this->stream->removeListener('data', array($this, 'handleData'));
@@ -138,34 +136,34 @@ public function handleData($data)
             $this->response = $response;
             $that = $this;
 
-            $response->on('end', function() use ($that) {
+            $response->on('end', function () use ($that) {
                 $that->close();
             });
-            $response->on('error', function(\Exception $error) use ($that) {
+            $response->on('error', function (\Exception $error) use ($that) {
                 $that->closeError(new \RuntimeException(
-                    "response error",
+                    "An error occured in the response",
                     0,
                     $error
                 ));
             });
 
             $this->emit('response', array($response, $this));
 
-            $response->emit('data', array($body));
+            $response->emit('data', array($bodyChunk));
         }
     }
 
     public function handleEnd()
     {
         $this->closeError(new \RuntimeException(
-            "connection closed before receiving response"
+            "Connection closed before receiving response"
         ));
     }
 
     public function handleError($error)
     {
         $this->closeError(new \RuntimeException(
-            "stream error",
+            "An error occurred in the underlying stream",
             0,
             $error
         ));
@@ -220,7 +218,7 @@ protected function connect($callback)
         $connectionManager = $this->connectionManager;
         $that = $this;
 
-        $connectionManager->getConnection(function($stream) use ($that, $callback) {
+        $connectionManager->getConnection(function ($stream) use ($that, $callback) {
             call_user_func($callback, $stream);
         }, $host, $port);
     }
@@ -233,7 +231,6 @@ public function setResponseFactory($factory)
     public function getResponseFactory()
     {
         if (null === $factory = $this->responseFactory) {
-
             $loop = $this->loop;
             $stream = $this->stream;
 

Client/Response.php

@@ -4,8 +4,8 @@
 
 use Evenement\EventEmitter;
 use React\EventLoop\LoopInterface;
-use React\Stream\Stream;
 use React\Stream\ReadableStreamInterface;
+use React\Stream\Stream;
 use React\Stream\Util;
 use React\Stream\WritableStreamInterface;
 
@@ -79,7 +79,7 @@ public function handleEnd()
     public function handleError(\Exception $error)
     {
         $this->emit('error', array(new \RuntimeException(
-            "an error occurred in the underlying stream",
+            "An error occurred in the underlying stream",
             0,
             $error
         ), $this));

Client/SecureConnectionManager.php

@@ -11,18 +11,18 @@ public function handleConnectedSocket($callback, $socket)
     {
         $loop = $this->loop;
 
-        $enableCrypto = function() use ($callback, $socket, $loop) {
+        $enableCrypto = function () use ($callback, $socket, $loop) {
 
             $result = stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
 
-            // crypto was successfully enabled
             if (true === $result) {
+                // crypto was successfully enabled
                 $loop->removeWriteStream($socket);
                 $loop->removeReadStream($socket);
                 call_user_func($callback, new Stream($socket, $loop));
 
-            // an error occured
             } else if (false === $result) {
+                // an error occured
                 $loop->removeWriteStream($socket);
                 $loop->removeReadStream($socket);
                 call_user_func($callback, null);