Commit06b25c7

committed

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

1 parent98e0fa4 commit06b25c7Copy full SHA for 06b25c7

File tree

+18

-3

lines changed

+18

-3

lines changed

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -218,4 +218,18 @@ public function testStopwatchDestruct()`
`218`	`218`	`$this->assertCount(1,$events['GET http://localhost:8057']->getPeriods());`
`219`	`219`	`$this->assertGreaterThan(0.0,$events['GET http://localhost:8057']->getDuration());`
`220`	`220`	`}`
	`221`	`+`
	`222`	`+publicfunctiontestWithOptions()`
	`223`	`+ {`
	`224`	`+$sut =newTraceableHttpClient(newNativeHttpClient());`
	`225`	`+`
	`226`	`+$sut2 =$sut->withOptions(['base_uri' =>'http://localhost:8057']);`
	`227`	`+`
	`228`	`+$response =$sut2->request('GET','/');`
	`229`	`+`
	`230`	`+$this->assertSame(200,$response->getStatusCode());`
	`231`	`+$this->assertSame('http://localhost:8057/',$response->getInfo('url'));`
	`232`	`+`
	`233`	`+$this->assertCount(1,$sut->getTracedRequests());`
	`234`	`+ }`
`221`	`235`	`}`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,14 @@`
`27`	`27`	`finalclass TraceableHttpClientimplements HttpClientInterface, ResetInterface, LoggerAwareInterface`
`28`	`28`	`{`
`29`	`29`	`private$client;`
`30`		`-private$tracedRequests = [];`
`31`	`30`	`private$stopwatch;`
	`31`	`+private$tracedRequests;`
`32`	`32`
`33`	`33`	`publicfunction__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`	`publicfunctiongetTracedRequests():array`
`86`	`87`	`{`
`87`		`-return$this->tracedRequests;`
	`88`	`+return$this->tracedRequests->getArrayCopy();`
`88`	`89`	`}`
`89`	`90`
`90`	`91`	`publicfunctionreset()`
`@@ -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`	`/**`

Comments

(0)