Skip to content

Commit 7054ad4

Browse files
Merge branch '6.1' into 6.2
* 6.1: [Mailer] Include all transports' debug messages in RoundRobin transport exception [FrameworkBundle] fix: fix help message Fix HtmlSanitizer default configuration behavior for allowed schemes Use relative timestamps [Cache] Fix dealing with ext-redis' multi/exec returning a bool [Messenger][Amqp] Added missing rpc_timeout option [Serializer] Prevent GetSetMethodNormalizer from creating invalid magic method call [HttpFoundation] Fix dumping array cookies [WebProfilerBundle] Fix dump header not being displayed TraceableHttpClient: increase decorator's priority Use static methods inside data providers [FrameworkBundle] Allow configuring `framework.exceptions` with a config builder bug #48313 [Mime] Fix MessagePart serialization [HttpKernel][ErrorHandler] Fix reading the SYMFONY_IDE env var [ErrorHandler][DebugClassLoader] Fix some new return types support Fix getting the name of closures on PHP 8.1.11+ [Translator] Fix typo "internal" / "interval" fix dumping top-level tagged values [Console] Fix clear line with question in section
2 parents 153540b + c7c6c95 commit 7054ad4

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

DependencyInjection/HttpClientPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function process(ContainerBuilder $container)
2929
$container->register('.debug.'.$id, TraceableHttpClient::class)
3030
->setArguments([new Reference('.debug.'.$id.'.inner'), new Reference('debug.stopwatch', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)])
3131
->addTag('kernel.reset', ['method' => 'reset'])
32-
->setDecoratedService($id);
32+
->setDecoratedService($id, null, 5);
3333
$container->getDefinition('data_collector.http_client')
3434
->addMethodCall('registerClient', [$id, new Reference('.debug.'.$id)]);
3535
}

Tests/DependencyInjection/HttpClientPassTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function testItDecoratesHttpClientWithTraceableHttpClient()
3838
$sut->process($container);
3939
$this->assertTrue($container->hasDefinition('.debug.foo'));
4040
$this->assertSame(TraceableHttpClient::class, $container->getDefinition('.debug.foo')->getClass());
41-
$this->assertSame(['foo', null, 0], $container->getDefinition('.debug.foo')->getDecoratedService());
41+
$this->assertSame(['foo', null, 5], $container->getDefinition('.debug.foo')->getDecoratedService());
4242
}
4343

4444
public function testItRegistersDebugHttpClientToCollector()

0 commit comments

Comments
 (0)