Skip to content

Commit e7b9501

Browse files
committed
Merge branch '7.2' into 7.3
* 7.2: (47 commits) Remove comment about AppVeyor in `phpunit` [Webhook][RemoteEvent] fix SendgridPayloadConverter category support Update old Appveyor skip conditions sync the Dutch translation file with changes from the 7.2 branch [Yaml] fix inline notation with inline comment clean up code for doctrine/persistence 2.x Generate missing translations using Gemini fix(property-info): make sure that SerializerExtractor returns null for invalid class metadata add translations for the Slug constraint [RemoteEvent][Webhook] fix SendgridRequestParser & SendgridPayloadConverter in case of missing sg_message_id [Messenger] Fix `TransportMessageIdStamp` not always added [DoctrineBridge] Fix compatibility to Doctrine persistence 2.5 in Doctrine Bridge 6.4 to avoid Projects stuck on 6.3 [PropertyInfo] Fix add missing composer conflict [ErrorHandler] Don't trigger "internal" deprecations for anonymous LazyClosure instances [VarDumper] Fix displaying closure's "this" from anonymous classes [Doctrine][Messenger] Prevents multiple TransportMessageIdStamp being stored in envelope [HttpKernel] Don't override existing LoggerInterface autowiring alias in LoggerPass reject inline notations followed by invalid content Fix predis command error checking [Security] Fix triggering session tracking from ContextListener ...
2 parents d9bdbae + 609878e commit e7b9501

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2621,11 +2621,13 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
26212621
->setFactory([ScopingHttpClient::class, 'forBaseUri'])
26222622
->setArguments([new Reference('http_client.transport'), $baseUri, $scopeConfig])
26232623
->addTag('http_client.client')
2624+
->addTag('kernel.reset', ['method' => 'reset', 'on_invalid' => 'ignore'])
26242625
;
26252626
} else {
26262627
$container->register($name, ScopingHttpClient::class)
26272628
->setArguments([new Reference('http_client.transport'), [$scope => $scopeConfig], $scope])
26282629
->addTag('http_client.client')
2630+
->addTag('kernel.reset', ['method' => 'reset', 'on_invalid' => 'ignore'])
26292631
;
26302632
}
26312633

Resources/config/http_client.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
->factory('current')
4040
->args([[service('http_client.transport')]])
4141
->tag('http_client.client')
42+
->tag('kernel.reset', ['method' => 'reset', 'on_invalid' => 'ignore'])
4243

4344
->alias(HttpClientInterface::class, 'http_client')
4445

Tests/DependencyInjection/FrameworkExtensionTestCase.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1958,8 +1958,12 @@ public function testHttpClientDefaultOptions()
19581958
];
19591959
$this->assertSame([$defaultOptions, 4], $container->getDefinition('http_client.transport')->getArguments());
19601960

1961+
$this->assertTrue($container->getDefinition('http_client')->hasTag('kernel.reset'));
1962+
19611963
$this->assertTrue($container->hasDefinition('foo'), 'should have the "foo" service.');
1962-
$this->assertSame(ScopingHttpClient::class, $container->getDefinition('foo')->getClass());
1964+
$definition = $container->getDefinition('foo');
1965+
$this->assertSame(ScopingHttpClient::class, $definition->getClass());
1966+
$this->assertTrue($definition->hasTag('kernel.reset'));
19631967
}
19641968

19651969
public function testScopedHttpClientWithoutQueryOption()

0 commit comments

Comments
 (0)