HttpClient PSR-18

Author: ProklUng

config/base.yaml

@@ -77,6 +77,14 @@ services:
   psr17.http_factory:
     class: Prokl\ServiceProvider\Services\PSR\PSR17\HttpFactory
 
+  Prokl\ServiceProvider\Services\PSR\PSR17\HttpFactory: '@psr17.http_factory'
+
+  # Http client стандарта PSR-18
+  psr18.http_client:
+    class: Prokl\ServiceProvider\Services\PSR\PSR18\PsrClient
+
+  Prokl\ServiceProvider\Services\PSR\PSR18\PsrClient: '@psr18.http_client'
+
   # Request приложения.
   global.request:
     class: Symfony\Component\HttpFoundation\Request

readme.MD

@@ -133,6 +133,8 @@ var_dump(container($micro)->getParameter('example'));
 - `bitrix.request.psr7` - Битриксовый Request, приведенный к PSR-7
 - `bitrix.response` - Response, полученный из битриксового
 - `bitrix.response.psr7` - Битриксовый Response, приведенный к PSR-7
+- `psr17.http_factory` - HttpFactory стандарта PSR-17
+- `psr18.http_client` - Http client стандарта PSR-18
 
 ## Хэлперы
 

src/Services/PSR/PSR17/HttpFactory.php

@@ -24,6 +24,8 @@
 /**
  * Class HttpFactory
  * @package Prokl\ServiceProvider\Services\PSR\PSR17
+ *
+ * @see https://github.com/beta-eto-code/bitrix-psr17 (fork)
  */
 class HttpFactory implements
     RequestFactoryInterface,

src/Services/PSR/PSR18/PsrClient.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace Prokl\ServiceProvider\Services\PSR\PSR18;
+
+use Bitrix\Main\Web\HttpClient;
+use Bitrix\Main\Web\HttpHeaders;
+use GuzzleHttp\Psr7\Response;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * Class PsrClient
+ * @package Prokl\ServiceProvider\Services\PSR\PSR18
+ *
+ * @see https://github.com/beta-eto-code/bitrix-psr18 (fork)
+ */
+class PsrClient implements ClientInterface
+{
+    /**
+     * @var HttpClient $httpClient
+     */
+    private $httpClient;
+
+    /**
+     * Client constructor.
+     *
+     * @param HttpClient|null $httpClient
+     */
+    public function __construct(HttpClient $httpClient = null)
+    {
+        $this->httpClient = $httpClient ?? new HttpClient();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function sendRequest(RequestInterface $request): ResponseInterface
+    {
+        $method = strtoupper($request->getMethod());
+        $bxClient = clone $this->httpClient;
+        $this->loadHeaders($bxClient, $request);
+
+        $body = (string)$request->getBody();
+        if (empty($body)) {
+            $body = null;
+        }
+
+        $bxClient->query($method, (string)$request->getUri(), $body);
+        $responseBody = $bxClient->getResult();
+        if (empty($responseBody)) {
+            $responseBody = null;
+        }
+
+        return new Response($bxClient->getStatus(), $this->normalizeHeader($bxClient->getHeaders()), $responseBody);
+    }
+
+
+    /**
+     * @param HttpClient $httpClient
+     * @param RequestInterface $request
+     */
+    private function loadHeaders(HttpClient $httpClient, RequestInterface $request)
+    {
+        $httpClient->clearHeaders();
+        foreach ($request->getHeaders() as $name => $values) {
+            $httpClient->setHeader($name, implode(", ", $values));
+        }
+    }
+
+    /**
+     * @param HttpHeaders $headers
+     * @return array
+     */
+    private function normalizeHeader(HttpHeaders $headers): array
+    {
+        $result = [];
+        foreach ($headers as $key => $value) {
+            $result[$key] = implode(", ", (array)$value);
+        }
+
+        return $result;
+    }
+}