mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-23 10:38:45 +02:00
N°6934 - Symfony 6.4 - upgrade Symfony bundles to 6.4 (#580)
* Update Symfony lib to version ~6.4.0 * Update code missing return type * Add an iTop general configuration entry to store application secret (Symfony mandatory parameter) * Use dependency injection in ExceptionListener & UserProvider classes
This commit is contained in:
@@ -11,18 +11,21 @@
|
||||
|
||||
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
|
||||
|
||||
use Http\Client\HttpAsyncClient;
|
||||
use Psr\Http\Client\ClientInterface;
|
||||
use Psr\Http\Message\ResponseFactoryInterface;
|
||||
use Psr\Http\Message\StreamFactoryInterface;
|
||||
use Symfony\Component\HttpClient\HttpClient;
|
||||
use Symfony\Component\HttpClient\HttplugClient;
|
||||
use Symfony\Component\HttpClient\Messenger\PingWebhookMessageHandler;
|
||||
use Symfony\Component\HttpClient\Psr18Client;
|
||||
use Symfony\Component\HttpClient\Retry\GenericRetryStrategy;
|
||||
use Symfony\Component\HttpClient\UriTemplateHttpClient;
|
||||
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
||||
|
||||
return static function (ContainerConfigurator $container) {
|
||||
$container->services()
|
||||
->set('http_client', HttpClientInterface::class)
|
||||
->set('http_client.transport', HttpClientInterface::class)
|
||||
->factory([HttpClient::class, 'create'])
|
||||
->args([
|
||||
[], // default options
|
||||
@@ -31,6 +34,10 @@ return static function (ContainerConfigurator $container) {
|
||||
->call('setLogger', [service('logger')->ignoreOnInvalid()])
|
||||
->tag('monolog.logger', ['channel' => 'http_client'])
|
||||
->tag('kernel.reset', ['method' => 'reset', 'on_invalid' => 'ignore'])
|
||||
|
||||
->set('http_client', HttpClientInterface::class)
|
||||
->factory('current')
|
||||
->args([[service('http_client.transport')]])
|
||||
->tag('http_client.client')
|
||||
|
||||
->alias(HttpClientInterface::class, 'http_client')
|
||||
@@ -44,13 +51,17 @@ return static function (ContainerConfigurator $container) {
|
||||
|
||||
->alias(ClientInterface::class, 'psr18.http_client')
|
||||
|
||||
->set(\Http\Client\HttpClient::class, HttplugClient::class)
|
||||
->set('httplug.http_client', HttplugClient::class)
|
||||
->args([
|
||||
service('http_client'),
|
||||
service(ResponseFactoryInterface::class)->ignoreOnInvalid(),
|
||||
service(StreamFactoryInterface::class)->ignoreOnInvalid(),
|
||||
])
|
||||
|
||||
->alias(HttpAsyncClient::class, 'httplug.http_client')
|
||||
->alias(\Http\Client\HttpClient::class, 'httplug.http_client')
|
||||
->deprecate('symfony/framework-bundle', '6.3', 'The "%alias_id%" service is deprecated, use "'.ClientInterface::class.'" instead.')
|
||||
|
||||
->set('http_client.abstract_retry_strategy', GenericRetryStrategy::class)
|
||||
->abstract()
|
||||
->args([
|
||||
@@ -60,5 +71,31 @@ return static function (ContainerConfigurator $container) {
|
||||
abstract_arg('max delay ms'),
|
||||
abstract_arg('jitter'),
|
||||
])
|
||||
|
||||
->set('http_client.uri_template', UriTemplateHttpClient::class)
|
||||
->decorate('http_client', null, 7) // Between TraceableHttpClient (5) and RetryableHttpClient (10)
|
||||
->args([
|
||||
service('.inner'),
|
||||
service('http_client.uri_template_expander')->nullOnInvalid(),
|
||||
abstract_arg('default vars'),
|
||||
])
|
||||
|
||||
->set('http_client.uri_template_expander.guzzle', \Closure::class)
|
||||
->factory([\Closure::class, 'fromCallable'])
|
||||
->args([
|
||||
[\GuzzleHttp\UriTemplate\UriTemplate::class, 'expand'],
|
||||
])
|
||||
|
||||
->set('http_client.uri_template_expander.rize', \Closure::class)
|
||||
->factory([\Closure::class, 'fromCallable'])
|
||||
->args([
|
||||
[inline_service(\Rize\UriTemplate::class), 'expand'],
|
||||
])
|
||||
|
||||
->set('http_client.messenger.ping_webhook_handler', PingWebhookMessageHandler::class)
|
||||
->args([
|
||||
service('http_client'),
|
||||
])
|
||||
->tag('messenger.message_handler')
|
||||
;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user