Add Request class (#1623)

src/HttpClient/HttpClient.php

@@ -28,13 +28,18 @@ public function __construct(string $sdkIdentifier, string $sdkVersion)
         $this->sdkVersion = $sdkVersion;
     }
 
-    public function sendRequest(string $requestData, Options $options): Response
+    public function sendRequest(Request $request, Options $options): Response
     {
         $dsn = $options->getDsn();
         if ($dsn === null) {
             throw new \RuntimeException('The DSN option must be set to use the HttpClient.');
         }
 
+        $requestData = $request->getStringBody();
+        if ($requestData === null) {
+            throw new \RuntimeException('The request data is empty.');
+        }
+
         $curlHandle = curl_init();
 
         $requestHeaders = Http::getRequestHeaders($dsn, $this->sdkIdentifier, $this->sdkVersion);

src/HttpClient/HttpClientInterface.php

@@ -8,5 +8,5 @@
 
 interface HttpClientInterface
 {
-    public function sendRequest(string $requestData, Options $options): Response;
+    public function sendRequest(Request $request, Options $options): Response;
 }

src/HttpClient/Request.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sentry\HttpClient;
+
+/**
+ * @internal
+ */
+final class Request
+{
+    /**
+     * @var string
+     */
+    private $stringBody;
+
+    public function getStringBody(): ?string
+    {
+        return $this->stringBody;
+    }
+
+    public function setStringBody(string $stringBody): void
+    {
+        $this->stringBody = $stringBody;
+    }
+}

src/Transport/HttpTransport.php

@@ -8,6 +8,7 @@
 use Psr\Log\NullLogger;
 use Sentry\Event;
 use Sentry\HttpClient\HttpClientInterface;
+use Sentry\HttpClient\Request;
 use Sentry\Options;
 use Sentry\Serializer\PayloadSerializerInterface;
 
@@ -79,8 +80,11 @@ public function send(Event $event): Result
             return new Result(ResultStatus::rateLimit());
         }
 
+        $request = new Request();
+        $request->setStringBody($this->payloadSerializer->serialize($event));
+
         try {
-            $response = $this->httpClient->sendRequest($this->payloadSerializer->serialize($event), $this->options);
+            $response = $this->httpClient->sendRequest($request, $this->options);
         } catch (\Throwable $exception) {
             $this->logger->error(
                 sprintf('Failed to send the event to Sentry. Reason: "%s".', $exception->getMessage()),

tests/ClientBuilderTest.php

@@ -10,6 +10,7 @@
 use Sentry\Event;
 use Sentry\HttpClient\HttpClient;
 use Sentry\HttpClient\HttpClientInterface;
+use Sentry\HttpClient\Request;
 use Sentry\HttpClient\Response;
 use Sentry\Integration\IntegrationInterface;
 use Sentry\Options;
@@ -123,7 +124,7 @@ public function setupOnce(): void
 
 final class CustomHttpClient implements HttpClientInterface
 {
-    public function sendRequest(string $requestData, Options $options): Response
+    public function sendRequest(Request $request, Options $options): Response
     {
         return new Response(0, [], '');
     }