Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 609878e

Browse filesBrowse files
committed
Merge branch '7.1' into 7.2
* 7.1: (27 commits) add translations for the Slug constraint [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 [Security] Fix triggering session tracking from ContextListener [AssetMapper] add leading slash to public prefix fix: modify Exception message parameter order [Yaml] Fix parsing of unquoted strings in Parser::lexUnquotedString() to ignore spaces Update exception.css Remove outdated guard from security xsd schema Bump Symfony version to 7.1.11 Update VERSION for 7.1.10 Update CHANGELOG for 7.1.10 Bump Symfony version to 6.4.18 Update VERSION for 6.4.17 ...
2 parents aaf86f3 + e6875bc commit 609878e
Copy full SHA for 609878e

File tree

3 files changed

+8
-1
lines changed
Filter options

3 files changed

+8
-1
lines changed

‎DependencyInjection/FrameworkExtension.php

Copy file name to clipboardExpand all lines: DependencyInjection/FrameworkExtension.php
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2552,11 +2552,13 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
25522552
->setFactory([ScopingHttpClient::class, 'forBaseUri'])
25532553
->setArguments([new Reference('http_client.transport'), $baseUri, $scopeConfig])
25542554
->addTag('http_client.client')
2555+
->addTag('kernel.reset', ['method' => 'reset', 'on_invalid' => 'ignore'])
25552556
;
25562557
} else {
25572558
$container->register($name, ScopingHttpClient::class)
25582559
->setArguments([new Reference('http_client.transport'), [$scope => $scopeConfig], $scope])
25592560
->addTag('http_client.client')
2561+
->addTag('kernel.reset', ['method' => 'reset', 'on_invalid' => 'ignore'])
25602562
;
25612563
}
25622564

‎Resources/config/http_client.php

Copy file name to clipboardExpand all lines: Resources/config/http_client.php
+1Lines 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

Copy file name to clipboardExpand all lines: Tests/DependencyInjection/FrameworkExtensionTestCase.php
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1950,8 +1950,12 @@ public function testHttpClientDefaultOptions()
19501950
];
19511951
$this->assertSame([$defaultOptions, 4], $container->getDefinition('http_client.transport')->getArguments());
19521952

1953+
$this->assertTrue($container->getDefinition('http_client')->hasTag('kernel.reset'));
1954+
19531955
$this->assertTrue($container->hasDefinition('foo'), 'should have the "foo" service.');
1954-
$this->assertSame(ScopingHttpClient::class, $container->getDefinition('foo')->getClass());
1956+
$definition = $container->getDefinition('foo');
1957+
$this->assertSame(ScopingHttpClient::class, $definition->getClass());
1958+
$this->assertTrue($definition->hasTag('kernel.reset'));
19551959
}
19561960

19571961
public function testScopedHttpClientWithoutQueryOption()

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.