[HttpClient] Fix tracing requests made after calling withOptions()

nicolas-grekas · nicolas-grekas · commit 06b25c713b6e · 2021-12-16T18:39:42.000+01:00
diff --git a/src/Symfony/Component/HttpClient/Tests/TraceableHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/TraceableHttpClientTest.php
@@ -218,4 +218,18 @@ public function testStopwatchDestruct()
         $this->assertCount(1, $events['GET http://localhost:8057']->getPeriods());
         $this->assertGreaterThan(0.0, $events['GET http://localhost:8057']->getDuration());
     }
+
+    public function testWithOptions()
+    {
+        $sut = new TraceableHttpClient(new NativeHttpClient());
+
+        $sut2 = $sut->withOptions(['base_uri' => 'http://localhost:8057']);
+
+        $response = $sut2->request('GET', '/');
+
+        $this->assertSame(200, $response->getStatusCode());
+        $this->assertSame('http://localhost:8057/', $response->getInfo('url'));
+
+        $this->assertCount(1, $sut->getTracedRequests());
+    }
 }
diff --git a/src/Symfony/Component/HttpClient/TraceableHttpClient.php b/src/Symfony/Component/HttpClient/TraceableHttpClient.php
@@ -27,13 +27,14 @@
 final class TraceableHttpClient implements HttpClientInterface, ResetInterface, LoggerAwareInterface
 {
     private $client;
-    private $tracedRequests = [];
     private $stopwatch;
+    private $tracedRequests;
 
     public function __construct(HttpClientInterface $client, Stopwatch $stopwatch = null)
     {
         $this->client = $client;
         $this->stopwatch = $stopwatch;
+        $this->tracedRequests = new \ArrayObject();
     }
 
     /**
@@ -84,7 +85,7 @@ public function stream($responses, float $timeout = null): ResponseStreamInterfa
 
     public function getTracedRequests(): array
     {
-        return $this->tracedRequests;
+        return $this->tracedRequests->getArrayCopy();
     }
 
     public function reset()
@@ -93,7 +94,7 @@ public function reset()
             $this->client->reset();
         }
 
-        $this->tracedRequests = [];
+        $this->tracedRequests->exchangeArray([]);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,14 @@`
`27`	`27`	`final class TraceableHttpClient implements HttpClientInterface, ResetInterface, LoggerAwareInterface`
`28`	`28`	`{`
`29`	`29`	`private $client;`
`30`		`- private $tracedRequests = [];`
`31`	`30`	`private $stopwatch;`
	`31`	`+ private $tracedRequests;`
`32`	`32`
`33`	`33`	`public function __construct(HttpClientInterface $client, Stopwatch $stopwatch = null)`
`34`	`34`	`{`
`35`	`35`	`$this->client = $client;`
`36`	`36`	`$this->stopwatch = $stopwatch;`
	`37`	`+ $this->tracedRequests = new \ArrayObject();`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`/**`
`@@ -84,7 +85,7 @@ public function stream($responses, float $timeout = null): ResponseStreamInterfa`
`84`	`85`
`85`	`86`	`public function getTracedRequests(): array`
`86`	`87`	`{`
`87`		`- return $this->tracedRequests;`
	`88`	`+ return $this->tracedRequests->getArrayCopy();`
`88`	`89`	`}`
`89`	`90`
`90`	`91`	`public function reset()`
`@@ -93,7 +94,7 @@ public function reset()`
`93`	`94`	`$this->client->reset();`
`94`	`95`	`}`
`95`	`96`
`96`		`- $this->tracedRequests = [];`
	`97`	`+ $this->tracedRequests->exchangeArray([]);`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`/**`