Skip to content

Commit 1ed5e59

Browse files
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
2 parents 7e438da + d54edff commit 1ed5e59

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

FrameworkBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public function build(ContainerBuilder $container)
147147
$container->addCompilerPass(new CachePoolPrunerPass(), PassConfig::TYPE_AFTER_REMOVING);
148148
$this->addCompilerPassIfExists($container, FormPass::class);
149149
$container->addCompilerPass(new WorkflowGuardListenerPass());
150-
$container->addCompilerPass(new ResettableServicePass());
150+
$container->addCompilerPass(new ResettableServicePass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, -32);
151151
$container->addCompilerPass(new RegisterLocaleAwareServicesPass());
152152
$container->addCompilerPass(new TestServiceContainerWeakRefPass(), PassConfig::TYPE_BEFORE_REMOVING, -32);
153153
$container->addCompilerPass(new TestServiceContainerRealRefPass(), PassConfig::TYPE_AFTER_REMOVING);

Resources/config/http_client.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
])
3131
->call('setLogger', [service('logger')->ignoreOnInvalid()])
3232
->tag('monolog.logger', ['channel' => 'http_client'])
33+
->tag('kernel.reset', ['method' => 'reset', 'on_invalid' => 'ignore'])
3334
->tag('http_client.client')
3435

3536
->alias(HttpClientInterface::class, 'http_client')

0 commit comments

Comments
 (0)