Create HttpFactory for creating Response objects

Author: Art4

src/Redmine/Api/AbstractApi.php

@@ -9,6 +9,7 @@
 use Redmine\Exception;
 use Redmine\Exception\SerializerException;
 use Redmine\Http\HttpClient;
+use Redmine\Http\HttpFactory;
 use Redmine\Http\Request;
 use Redmine\Http\Response;
 use Redmine\Serializer\JsonSerializer;
@@ -73,7 +74,7 @@ final protected function getHttpClient(): HttpClient
 
     final protected function getLastResponse(): Response
     {
-        return $this->lastResponse !== null ? $this->lastResponse : $this->createResponse(0, '', '');
+        return $this->lastResponse !== null ? $this->lastResponse : HttpFactory::makeResponse(0, '', '');
     }
 
     /**
@@ -412,16 +413,12 @@ private function getResponseAsArray(Response $response): array
 
     private function handleClient(Client $client): HttpClient
     {
-        $responseFactory = Closure::fromCallable([$this, 'createResponse']);
-
-        return new class ($client, $responseFactory) implements HttpClient {
+        return new class ($client) implements HttpClient {
             private $client;
-            private $responseFactory;
 
-            public function __construct(Client $client, Closure $responseFactory)
+            public function __construct(Client $client)
             {
                 $this->client = $client;
-                $this->responseFactory = $responseFactory;
             }
 
             public function request(Request $request): Response
@@ -436,7 +433,7 @@ public function request(Request $request): Response
                     $this->client->requestGet($request->getPath());
                 }
 
-                return ($this->responseFactory)(
+                return HttpFactory::makeResponse(
                     $this->client->getLastResponseStatusCode(),
                     $this->client->getLastResponseContentType(),
                     $this->client->getLastResponseBody()
@@ -445,37 +442,6 @@ public function request(Request $request): Response
         };
     }
 
-    private function createResponse(int $statusCode, string $contentType, string $body): Response
-    {
-        return new class ($statusCode, $contentType, $body) implements Response {
-            private $statusCode;
-            private $contentType;
-            private $body;
-
-            public function __construct(int $statusCode, string $contentType, string $body)
-            {
-                $this->statusCode = $statusCode;
-                $this->contentType = $contentType;
-                $this->body = $body;
-            }
-
-            public function getStatusCode(): int
-            {
-                return $this->statusCode;
-            }
-
-            public function getContentType(): string
-            {
-                return $this->contentType;
-            }
-
-            public function getContent(): string
-            {
-                return $this->body;
-            }
-        };
-    }
-
     private function createRequest(string $method, string $path, string $contentType, string $content = ''): Request
     {
         return new class ($method, $path, $contentType, $content) implements Request {

src/Redmine/Client/NativeCurlClient.php

@@ -6,6 +6,7 @@
 
 use Redmine\Exception\ClientException;
 use Redmine\Http\HttpClient;
+use Redmine\Http\HttpFactory;
 use Redmine\Http\Request;
 use Redmine\Http\Response;
 
@@ -72,37 +73,11 @@ public function request(Request $request): Response
             $request->getContentType()
         );
 
-        return new class (
+        return HttpFactory::makeResponse(
             $this->lastResponseStatusCode,
             $this->lastResponseContentType,
             $this->lastResponseBody
-        ) implements Response {
-            private $statusCode;
-            private $contentType;
-            private $body;
-
-            public function __construct(int $statusCode, string $contentType, string $body)
-            {
-                $this->statusCode = $statusCode;
-                $this->contentType = $contentType;
-                $this->body = $body;
-            }
-
-            public function getStatusCode(): int
-            {
-                return $this->statusCode;
-            }
-
-            public function getContentType(): string
-            {
-                return $this->contentType;
-            }
-
-            public function getContent(): string
-            {
-                return $this->body;
-            }
-        };
+        );
     }
 
     /**

src/Redmine/Client/Psr18Client.php

@@ -14,6 +14,7 @@
 use Psr\Http\Message\StreamFactoryInterface;
 use Redmine\Exception\ClientException;
 use Redmine\Http\HttpClient;
+use Redmine\Http\HttpFactory;
 use Redmine\Http\Request;
 use Redmine\Http\Response;
 
@@ -90,37 +91,11 @@ public function request(Request $request): Response
             $request->getContentType()
         );
 
-        return new class (
+        return HttpFactory::makeResponse(
             $response->getStatusCode(),
             $response->getHeaderLine('Content-Type'),
             strval($response->getBody())
-        ) implements Response {
-            private $statusCode;
-            private $contentType;
-            private $body;
-
-            public function __construct(int $statusCode, string $contentType, string $body)
-            {
-                $this->statusCode = $statusCode;
-                $this->contentType = $contentType;
-                $this->body = $body;
-            }
-
-            public function getStatusCode(): int
-            {
-                return $this->statusCode;
-            }
-
-            public function getContentType(): string
-            {
-                return $this->contentType;
-            }
-
-            public function getContent(): string
-            {
-                return $this->body;
-            }
-        };
+        );
     }
 
     /**

src/Redmine/Http/HttpFactory.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Redmine\Http;
+
+/**
+ * Factory for HTTP objects.
+ *
+ * @internal
+ */
+final class HttpFactory
+{
+    public static function makeResponse(int $statusCode, string $contentType, string $content): Response
+    {
+        return new class ($statusCode, $contentType, $content) implements Response {
+            private $statusCode;
+            private $contentType;
+            private $body;
+
+            public function __construct(int $statusCode, string $contentType, string $body)
+            {
+                $this->statusCode = $statusCode;
+                $this->contentType = $contentType;
+                $this->body = $body;
+            }
+
+            public function getStatusCode(): int
+            {
+                return $this->statusCode;
+            }
+
+            public function getContentType(): string
+            {
+                return $this->contentType;
+            }
+
+            public function getContent(): string
+            {
+                return $this->body;
+            }
+        };
+    }
+}