Merge branch '5.4' into 6.0

* 5.4:
  Fix tests on PHP 8.1
  [Cache] Fix memory leak
  [Config] Add missing use statement in generated config builder classes
  [DependencyInjection] fix inlining when non-shared services are involved
  [FrameworkBundle] fix deprecation message
  [DoctrineBridge] add support for the JSON type
  [PHPUnitBridge] Fix Uncaught ValueError
  [HttpClient] Implement ResetInterface for all http clients
  [HttpKernel] allow ignoring kernel.reset methods that don't exist
  [FrameworkBundle] fix registering late resettable services
  [Validator] Missing translations for Greek (el)
  translate for japanese 101,102,103
  Use symfony-*-bridge instead of symfony-bridge for component bridges
  Fix Loco Provider
  [HttpClient] Curl http client has to reinit curl multi handle on reset
  [SecurityBundle] Fix compat with symfony/security-core:^6 (ter)
  [Validator] Add Swedish translation for issue #43737

Author: nicolas-grekas

CachingHttpClient.php

@@ -20,6 +20,7 @@
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 use Symfony\Contracts\HttpClient\ResponseStreamInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * Adds caching on top of an HTTP client.
@@ -30,7 +31,7 @@
  *
  * @author Nicolas Grekas <[email protected]>
  */
-class CachingHttpClient implements HttpClientInterface
+class CachingHttpClient implements HttpClientInterface, ResetInterface
 {
     use HttpClientTrait;
 
@@ -139,4 +140,11 @@ public function stream(ResponseInterface|iterable $responses, float $timeout = n
             yield $this->client->stream($clientResponses, $timeout);
         })());
     }
+
+    public function reset()
+    {
+        if ($this->client instanceof ResetInterface) {
+            $this->client->reset();
+        }
+    }
 }

DecoratorTrait.php

@@ -14,6 +14,7 @@
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 use Symfony\Contracts\HttpClient\ResponseStreamInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * Eases with writing decorators.
@@ -55,4 +56,11 @@ public function withOptions(array $options): static
 
         return $clone;
     }
+
+    public function reset()
+    {
+        if ($this->client instanceof ResetInterface) {
+            $this->client->reset();
+        }
+    }
 }

EventSourceHttpClient.php

@@ -19,12 +19,13 @@
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * @author Antoine Bluchet <[email protected]>
  * @author Nicolas Grekas <[email protected]>
  */
-final class EventSourceHttpClient implements HttpClientInterface
+final class EventSourceHttpClient implements HttpClientInterface, ResetInterface
 {
     use AsyncDecoratorTrait, HttpClientTrait {
         AsyncDecoratorTrait::withOptions insteadof HttpClientTrait;

HttplugClient.php

@@ -38,6 +38,7 @@
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
 if (!interface_exists(HttplugInterface::class)) {
     throw new \LogicException('You cannot use "Symfony\Component\HttpClient\HttplugClient" as the "php-http/httplug" package is not installed. Try running "composer require php-http/httplug".');
@@ -55,7 +56,7 @@
  *
  * @author Nicolas Grekas <[email protected]>
  */
-final class HttplugClient implements HttplugInterface, HttpAsyncClient, RequestFactory, StreamFactory, UriFactory
+final class HttplugClient implements HttplugInterface, HttpAsyncClient, RequestFactory, StreamFactory, UriFactory, ResetInterface
 {
     private HttpClientInterface $client;
     private ResponseFactoryInterface $responseFactory;
@@ -236,6 +237,13 @@ public function __destruct()
         $this->wait();
     }
 
+    public function reset()
+    {
+        if ($this->client instanceof ResetInterface) {
+            $this->client->reset();
+        }
+    }
+
     private function sendPsr7Request(RequestInterface $request, bool $buffer = null): ResponseInterface
     {
         try {

Internal/CurlClientState.php

@@ -63,6 +63,9 @@ public function reset()
                 curl_setopt($ch, \CURLOPT_VERBOSE, false);
             }
         }
+
+        curl_multi_close($this->handle);
+        $this->handle = curl_multi_init();
     }
 
     public function __sleep(): array

Internal/NativeClientState.php

@@ -33,4 +33,11 @@ public function __construct()
     {
         $this->id = random_int(\PHP_INT_MIN, \PHP_INT_MAX);
     }
+
+    public function reset()
+    {
+        $this->responseCount = 0;
+        $this->dnsCache = [];
+        $this->hosts = [];
+    }
 }

MockHttpClient.php

@@ -17,13 +17,14 @@
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 use Symfony\Contracts\HttpClient\ResponseStreamInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * A test-friendly HttpClient that doesn't make actual HTTP requests.
  *
  * @author Nicolas Grekas <[email protected]>
  */
-class MockHttpClient implements HttpClientInterface
+class MockHttpClient implements HttpClientInterface, ResetInterface
 {
     use HttpClientTrait;
 
@@ -113,4 +114,9 @@ public function withOptions(array $options): static
 
         return $clone;
     }
+
+    public function reset()
+    {
+        $this->requestsCount = 0;
+    }
 }

NativeHttpClient.php

@@ -21,6 +21,7 @@
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 use Symfony\Contracts\HttpClient\ResponseStreamInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * A portable implementation of the HttpClientInterface contracts based on PHP stream wrappers.
@@ -30,7 +31,7 @@
  *
  * @author Nicolas Grekas <[email protected]>
  */
-final class NativeHttpClient implements HttpClientInterface, LoggerAwareInterface
+final class NativeHttpClient implements HttpClientInterface, LoggerAwareInterface, ResetInterface
 {
     use HttpClientTrait;
     use LoggerAwareTrait;
@@ -252,6 +253,11 @@ public function stream(ResponseInterface|iterable $responses, float $timeout = n
         return new ResponseStream(NativeResponse::stream($responses, $timeout));
     }
 
+    public function reset()
+    {
+        $this->multi->reset();
+    }
+
     private static function getBodyAsString($body): string
     {
         if (\is_resource($body)) {

NoPrivateNetworkHttpClient.php

@@ -19,13 +19,14 @@
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 use Symfony\Contracts\HttpClient\ResponseStreamInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * Decorator that blocks requests to private networks by default.
  *
  * @author Hallison Boaventura <[email protected]>
  */
-final class NoPrivateNetworkHttpClient implements HttpClientInterface, LoggerAwareInterface
+final class NoPrivateNetworkHttpClient implements HttpClientInterface, LoggerAwareInterface, ResetInterface
 {
     use HttpClientTrait;
 
@@ -117,4 +118,11 @@ public function withOptions(array $options): static
 
         return $clone;
     }
+
+    public function reset()
+    {
+        if ($this->client instanceof ResetInterface) {
+            $this->client->reset();
+        }
+    }
 }

Psr18Client.php

@@ -31,6 +31,7 @@
 use Symfony\Component\HttpClient\Response\StreamWrapper;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
 if (!interface_exists(RequestFactoryInterface::class)) {
     throw new \LogicException('You cannot use the "Symfony\Component\HttpClient\Psr18Client" as the "psr/http-factory" package is not installed. Try running "composer require nyholm/psr7".');
@@ -49,7 +50,7 @@
  *
  * @author Nicolas Grekas <[email protected]>
  */
-final class Psr18Client implements ClientInterface, RequestFactoryInterface, StreamFactoryInterface, UriFactoryInterface
+final class Psr18Client implements ClientInterface, RequestFactoryInterface, StreamFactoryInterface, UriFactoryInterface, ResetInterface
 {
     private HttpClientInterface $client;
     private ResponseFactoryInterface $responseFactory;
@@ -190,6 +191,13 @@ public function createUri(string $uri = ''): UriInterface
 
         throw new \LogicException(sprintf('You cannot use "%s()" as the "nyholm/psr7" package is not installed. Try running "composer require nyholm/psr7".', __METHOD__));
     }
+
+    public function reset()
+    {
+        if ($this->client instanceof ResetInterface) {
+            $this->client->reset();
+        }
+    }
 }
 
 /**