Merge pull request #301 from seregazhuk/master

Some code improvements

Author: WyriHaximus

examples/06-sleep.php

@@ -11,8 +11,8 @@
 $loop = Factory::create();
 
 $server = new Server(function (ServerRequestInterface $request) use ($loop) {
-    return new Promise(function ($resolve, $reject) use ($request, $loop) {
-        $loop->addTimer(1.5, function() use ($loop, $resolve) {
+    return new Promise(function ($resolve, $reject) use ($loop) {
+        $loop->addTimer(1.5, function() use ($resolve) {
             $response = new Response(
                 200,
                 array(

src/Io/IniUtil.php

@@ -10,24 +10,24 @@ final class IniUtil
     /**
      * Convert a ini like size to a numeric size in bytes.
      *
-     * @param string $iniSetting
+     * @param string $size
      * @return int
      */
     public static function iniSizeToBytes($size)
     {
         if (is_numeric($size)) {
-            return $size;
+            return (int)$size;
         }
 
         $suffix = strtoupper(substr($size, -1));
         $strippedSize = substr($size, 0, -1);
 
         if (!is_numeric($strippedSize)) {
-            throw new \InvalidArgumentException('"' . $size . '" is not a valid ini size');
+            throw new \InvalidArgumentException("$size is not a valid ini size");
         }
 
         if ($strippedSize <= 0) {
-            throw new \InvalidArgumentException('Expect "' . $size . '" to be higher isn\'t zero or lower');
+            throw new \InvalidArgumentException("Expect $size to be higher isn't zero or lower");
         }
 
         if ($suffix === 'K') {
@@ -43,6 +43,6 @@ public static function iniSizeToBytes($size)
             return $strippedSize * 1024  * 1024 * 1024 * 1024;
         }
 
-        return $size;
+        return (int)$size;
     }
 }

src/Io/MiddlewareRunner.php

@@ -16,7 +16,7 @@ final class MiddlewareRunner
     /**
      * @var callable[]
      */
-    private $middleware = array();
+    private $middleware;
 
     /**
      * @param callable[] $middleware
@@ -33,7 +33,7 @@ public function __construct(array $middleware)
      */
     public function __invoke(ServerRequestInterface $request)
     {
-        if (count($this->middleware) === 0) {
+        if (empty($this->middleware)) {
             throw new \RuntimeException('No middleware to run');
         }
 

src/Io/MultipartParser.php

@@ -18,14 +18,14 @@
 final class MultipartParser
 {
     /**
-     * @var ServerRequestInterface
+     * @var ServerRequestInterface|null
      */
-    protected $request;
+    private $request;
 
     /**
      * @var int|null
      */
-    protected $maxFileSize;
+    private $maxFileSize;
 
     /**
      * ini setting "max_input_vars"

src/Io/PauseBufferStream.php

@@ -29,7 +29,7 @@ class PauseBufferStream extends EventEmitter implements ReadableStreamInterface
     private $dataPaused = '';
     private $endPaused = false;
     private $closePaused = false;
-    private $errorPaused = null;
+    private $errorPaused;
     private $implicit = false;
 
     public function __construct(ReadableStreamInterface $input)

src/Io/ServerRequest.php

@@ -25,19 +25,19 @@ class ServerRequest extends Request implements ServerRequestInterface
 {
     private $attributes = array();
 
-    private $serverParams = array();
+    private $serverParams;
     private $fileParams = array();
     private $cookies = array();
     private $queryParams = array();
-    private $parsedBody = null;
+    private $parsedBody;
 
     /**
      * @param null|string $method HTTP method for the request.
      * @param null|string|UriInterface $uri URI for the request.
      * @param array $headers Headers for the message.
      * @param string|resource|StreamInterface $body Message body.
      * @param string $protocolVersion HTTP protocol version.
-     * @param array server-side parameters
+     * @param array $serverParams server-side parameters
      *
      * @throws \InvalidArgumentException for an invalid URI
      */

src/Middleware/LimitConcurrentRequestsMiddleware.php

@@ -142,7 +142,6 @@ public function __invoke(ServerRequestInterface $request, $next)
         // queue request and process queue if pending does not exceed limit
         $queue[$id] = $deferred;
 
-        $that = $this;
         $pending = &$this->pending;
         return $this->await($deferred->promise()->then(function () use ($request, $next, $body, &$pending) {
             // invoke next request handler

src/Server.php

@@ -70,9 +70,7 @@ public function __construct($requestHandler)
         if (is_callable($requestHandler)) {
             $middleware[] = $requestHandler;
         } else {
-            foreach ($requestHandler as $one) {
-                $middleware[] = $one;
-            }
+            $middleware = array_merge($middleware, $requestHandler);
         }
 
         $this->streamingServer = new StreamingServer($middleware);

src/StreamingServer.php

@@ -3,7 +3,6 @@
 namespace React\Http;
 
 use Evenement\EventEmitter;
-use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use React\Http\Io\ChunkedDecoder;
@@ -171,7 +170,7 @@ public function handleConnection(ConnectionInterface $conn)
         $parser = new RequestHeaderParser($uriLocal, $uriRemote);
 
         $listener = array($parser, 'feed');
-        $parser->on('headers', function (RequestInterface $request, $bodyBuffer) use ($conn, $listener, $that) {
+        $parser->on('headers', function (ServerRequestInterface $request, $bodyBuffer) use ($conn, $listener, $that) {
             // parsing request completed => stop feeding parser
             $conn->removeListener('data', $listener);