Skip to content

Commit b594749

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [Security][WIP] Add authenticators info to the profiler [Translation] Use symfony default locale when pulling translations from providers added missing translations for Bosnian (bs) Add the missing greek translations for security core and validator component [HttpKernel] Fix return types in `EventDataCollector` Do not call substr_count() if ip is null to avoid deprecation warning in PHP 8.1 [Security][Validator] Add missing translations for Slovenian (sl) [Messenger] Add worker metadata inside logs [Messenger] Log when worker should stop and when `SIGTERM` is received cs fix [Security][Validator] Add missing translations for Finnish (fi) [VarDumper] returns a 500 when dd() is executed chore(VarDumper): declare that dd() never returns [MonologBridge] Deprecate the Swiftmailer handler [Cache] Commit items implicitly only when deferred keys are requested [MonologBridge] Deprecates ResetLoggersWorkerSubscriber Fix "can not" spelling [HttpClient] fix missing kernel.reset tag on TraceableHttpClient services [Form] Fix ChoiceType Extension to effectively set and use the translator Added new CssColor constraint
2 parents 9b95f72 + e7009f6 commit b594749

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

DependencyInjection/HttpClientPass.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public function process(ContainerBuilder $container)
3131
foreach ($container->findTaggedServiceIds('http_client.client') as $id => $tags) {
3232
$container->register('.debug.'.$id, TraceableHttpClient::class)
3333
->setArguments([new Reference('.debug.'.$id.'.inner'), new Reference('debug.stopwatch', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)])
34+
->addTag('kernel.reset', ['method' => 'reset'])
3435
->setDecoratedService($id);
3536
$container->getDefinition('data_collector.http_client')
3637
->addMethodCall('registerClient', [$id, new Reference('.debug.'.$id)]);

HttpClientTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
4848
throw new InvalidArgumentException(sprintf('Invalid HTTP method "%s", only uppercase letters are accepted.', $method));
4949
}
5050
if (!$method) {
51-
throw new InvalidArgumentException('The HTTP method can not be empty.');
51+
throw new InvalidArgumentException('The HTTP method cannot be empty.');
5252
}
5353
}
5454

NoPrivateNetworkHttpClient.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ final class NoPrivateNetworkHttpClient implements HttpClientInterface, LoggerAwa
5454
public function __construct(HttpClientInterface $client, string|array $subnets = null)
5555
{
5656
if (!class_exists(IpUtils::class)) {
57-
throw new \LogicException(sprintf('You can not use "%s" if the HttpFoundation component is not installed. Try running "composer require symfony/http-foundation".', __CLASS__));
57+
throw new \LogicException(sprintf('You cannot use "%s" if the HttpFoundation component is not installed. Try running "composer require symfony/http-foundation".', __CLASS__));
5858
}
5959

6060
$this->client = $client;

0 commit comments

Comments
 (0)