From 12e2dcacacbd6e60a1a18774b65eb3462795e1c7 Mon Sep 17 00:00:00 2001
From: Valentin V / vvval <valentin@spiralscout.com>
Date: Tue, 5 May 2020 16:43:29 +0300
Subject: #318 fix code style

---
 src/HttpClient.php |  2 +-
 src/PSR7Client.php | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/HttpClient.php b/src/HttpClient.php
index 42c434a8..4ca152c8 100644
--- a/src/HttpClient.php
+++ b/src/HttpClient.php
@@ -34,7 +34,7 @@ final class HttpClient
      * @return mixed[]|null Request information as ['ctx'=>[], 'body'=>string]
      *                      or null if termination request or invalid context.
      */
-    public function acceptRequest()
+    public function acceptRequest(): ?array
     {
         $body = $this->getWorker()->receive($ctx);
         if (empty($body) && empty($ctx)) {
diff --git a/src/PSR7Client.php b/src/PSR7Client.php
index 98897890..777dd891 100644
--- a/src/PSR7Client.php
+++ b/src/PSR7Client.php
@@ -10,11 +10,11 @@ declare(strict_types=1);
 namespace Spiral\RoadRunner;
 
 use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\UploadedFileInterface;
 use Psr\Http\Message\ServerRequestFactoryInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Message\UploadedFileFactoryInterface;
+use Psr\Http\Message\UploadedFileInterface;
 
 /**
  * Manages PSR-7 request and response.
@@ -69,7 +69,7 @@ class PSR7Client
     /**
      * @return ServerRequestInterface|null
      */
-    public function acceptRequest()
+    public function acceptRequest(): ?ServerRequestInterface
     {
         $rawRequest = $this->httpClient->acceptRequest();
         if ($rawRequest === null) {
@@ -101,11 +101,11 @@ class PSR7Client
         }
 
         if ($rawRequest['ctx']['parsed']) {
-            $request = $request->withParsedBody(json_decode($rawRequest['body'], true));
-        } else {
-            if ($rawRequest['body'] !== null) {
-                $request = $request->withBody($this->streamFactory->createStream($rawRequest['body']));
-            }
+            return $request->withParsedBody(json_decode($rawRequest['body'], true));
+        }
+
+        if ($rawRequest['body'] !== null) {
+            return $request->withBody($this->streamFactory->createStream($rawRequest['body']));
         }
 
         return $request;
-- 
cgit v1.2.3