Skip to content

Commit 91facb8

Browse files
committed
Merge branch '7.1' into 7.2
* 7.1: do not access typed property before initialization do not access typed properties before initialization Fix typo in deprecation message Symfony 5.4 LTS will get security fixes until Feb 2029 thanks to Ibexa' sponsoring Fix #53037
2 parents 4a04ae6 + 274e2f6 commit 91facb8

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

NoPrivateNetworkHttpClient.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ public function stream(ResponseInterface|iterable $responses, ?float $timeout =
7474
}
7575

7676
/**
77-
* @deprecated since Symfony 7.1, configure the logger on the wrapper HTTP client directly instead
77+
* @deprecated since Symfony 7.1, configure the logger on the wrapped HTTP client directly instead
7878
*/
7979
public function setLogger(LoggerInterface $logger): void
8080
{
81-
trigger_deprecation('symfony/http-client', '7.1', 'Configure the logger on the wrapper HTTP client directly instead.');
81+
trigger_deprecation('symfony/http-client', '7.1', 'Configure the logger on the wrapped HTTP client directly instead.');
8282

8383
if ($this->client instanceof LoggerAwareInterface) {
8484
$this->client->setLogger($logger);

ScopingHttpClient.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ public function reset(): void
9696
}
9797

9898
/**
99-
* @deprecated since Symfony 7.1, configure the logger on the wrapper HTTP client directly instead
99+
* @deprecated since Symfony 7.1, configure the logger on the wrapped HTTP client directly instead
100100
*/
101101
public function setLogger(LoggerInterface $logger): void
102102
{
103-
trigger_deprecation('symfony/http-client', '7.1', 'Configure the logger on the wrapper HTTP client directly instead.');
103+
trigger_deprecation('symfony/http-client', '7.1', 'Configure the logger on the wrapped HTTP client directly instead.');
104104

105105
if ($this->client instanceof LoggerAwareInterface) {
106106
$this->client->setLogger($logger);

TraceableHttpClient.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ public function reset(): void
8888
}
8989

9090
/**
91-
* @deprecated since Symfony 7.1, configure the logger on the wrapper HTTP client directly instead
91+
* @deprecated since Symfony 7.1, configure the logger on the wrapped HTTP client directly instead
9292
*/
9393
public function setLogger(LoggerInterface $logger): void
9494
{
95-
trigger_deprecation('symfony/http-client', '7.1', 'Configure the logger on the wrapper HTTP client directly instead.');
95+
trigger_deprecation('symfony/http-client', '7.1', 'Configure the logger on the wrapped HTTP client directly instead.');
9696

9797
if ($this->client instanceof LoggerAwareInterface) {
9898
$this->client->setLogger($logger);

0 commit comments

Comments
 (0)