fix withOptions test for v4

getsentry · Jul 5, 2022 · 39eaa7f · 39eaa7f
1 parent fd9f433
commit 39eaa7f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 1 deletion.
diff --git a/src/Tracing/HttpClient/TraceableHttpClientForV4.php b/src/Tracing/HttpClient/TraceableHttpClientForV4.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sentry\SentryBundle\Tracing\HttpClient;
+
+final class TraceableHttpClientForV4 extends AbstractTraceableHttpClient
+{
+}
diff --git a/src/aliases.php b/src/aliases.php
@@ -18,6 +18,7 @@
 use Sentry\SentryBundle\Tracing\Doctrine\DBAL\TracingStatementForV2;
 use Sentry\SentryBundle\Tracing\Doctrine\DBAL\TracingStatementForV3;
 use Sentry\SentryBundle\Tracing\HttpClient\TraceableHttpClient;
+use Sentry\SentryBundle\Tracing\HttpClient\TraceableHttpClientForV4;
 use Sentry\SentryBundle\Tracing\HttpClient\TraceableHttpClientForV5;
 use Sentry\SentryBundle\Tracing\HttpClient\TraceableHttpClientForV6;
 use Sentry\SentryBundle\Tracing\HttpClient\TraceableResponse;
@@ -62,7 +63,7 @@ class_alias(TracingDriverForV2::class, TracingDriver::class);
 if (!class_exists(TraceableResponse::class) && interface_exists(ResponseInterface::class)) {
     if (!interface_exists(StreamableInterface::class)) {
         class_alias(TraceableResponseForV4::class, TraceableResponse::class);
-        class_alias(TraceableHttpClientForV5::class, TraceableHttpClient::class);
+        class_alias(TraceableHttpClientForV4::class, TraceableHttpClient::class);
     } elseif (version_compare(\PHP_VERSION, '8.0', '>=')) {
         class_alias(TraceableResponseForV6::class, TraceableResponse::class);
         class_alias(TraceableHttpClientForV6::class, TraceableHttpClient::class);

diff --git a/tests/DependencyInjection/Fixtures/php/full.php b/tests/DependencyInjection/Fixtures/php/full.php
@@ -51,6 +51,9 @@
             'enabled' => false,
             'connections' => ['default'],
         ],
+        'http_client' => [
+            'enabled' => false,
+        ],
         'twig' => [
             'enabled' => false,
         ],

diff --git a/tests/DependencyInjection/Fixtures/xml/full.xml b/tests/DependencyInjection/Fixtures/xml/full.xml
@@ -49,6 +49,7 @@
             </sentry:dbal>
             <sentry:twig enabled="false" />
             <sentry:cache enabled="false" />
+            <sentry:http-client enabled="false" />
             <sentry:console>
                 <sentry:excluded-command>app:command</sentry:excluded-command>
             </sentry:console>

diff --git a/tests/DependencyInjection/Fixtures/yml/full.yml b/tests/DependencyInjection/Fixtures/yml/full.yml
@@ -50,6 +50,8 @@ sentry:
             enabled: false
         cache:
             enabled: false
+        http_client:
+            enabled: false
         console:
             excluded_commands:
               - app:command
diff --git a/tests/Tracing/HttpClient/TraceableHttpClientTest.php b/tests/Tracing/HttpClient/TraceableHttpClientTest.php
@@ -118,6 +118,10 @@ public function testResetCallShouldBeForwardedToDecoratedInstance(): void
 
     public function testWithOptions(): void
     {
+        if (!method_exists(MockHttpClient::class, 'withOptions')) {
+            self::markTestSkipped();
+        }
+
         $transaction = new Transaction(new TransactionContext());
         $transaction->initSpanRecorder();