Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commitcc497a5

Browse files
bug#31156 [FrameworkBundle] call method with Translator component only (xabbuh)
This PR was merged into the 4.2 branch.Discussion----------[FrameworkBundle] call method with Translator component only| Q | A| ------------- | ---| Branch? | 4.2| Bug fix? | yes| New feature? | no| BC breaks? | no| Deprecations? | no| Tests pass? | yes| Fixed tickets |#31152| License | MIT| Doc PR |Commits-------f49881d call method with Translator component only
2 parents87aef69 +f49881d commitcc497a5

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
useSymfony\Component\Stopwatch\Stopwatch;
9696
useSymfony\Component\Translation\Command\XliffLintCommandasBaseXliffLintCommand;
9797
useSymfony\Component\Translation\Translator;
98+
useSymfony\Component\Translation\TranslatorInterface;
9899
useSymfony\Component\Validator\ConstraintValidatorInterface;
99100
useSymfony\Component\Validator\ObjectInitializerInterface;
100101
useSymfony\Component\Validator\Util\LegacyTranslatorProxy;
@@ -1108,7 +1109,7 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
11081109

11091110
$validatorBuilder =$container->getDefinition('validator.builder');
11101111

1111-
if (class_exists(LegacyTranslatorProxy::class)) {
1112+
if (interface_exists(TranslatorInterface::class) &&class_exists(LegacyTranslatorProxy::class)) {
11121113
$calls =$validatorBuilder->getMethodCalls();
11131114
$calls[1] = ['setTranslator', [newDefinition(LegacyTranslatorProxy::class, [newReference('translator')])]];
11141115
$validatorBuilder->setMethodCalls($calls);

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
useSymfony\Component\Serializer\Normalizer\JsonSerializableNormalizer;
5050
useSymfony\Component\Serializer\Serializer;
5151
useSymfony\Component\Translation\DependencyInjection\TranslatorPass;
52+
useSymfony\Component\Translation\TranslatorInterface;
5253
useSymfony\Component\Validator\DependencyInjection\AddConstraintValidatorsPass;
5354
useSymfony\Component\Validator\Util\LegacyTranslatorProxy;
5455
useSymfony\Component\Workflow;
@@ -819,7 +820,7 @@ public function testValidation()
819820
$this->assertSame('setConstraintValidatorFactory',$calls[0][0]);
820821
$this->assertEquals([newReference('validator.validator_factory')],$calls[0][1]);
821822
$this->assertSame('setTranslator',$calls[1][0]);
822-
if (class_exists(LegacyTranslatorProxy::class)) {
823+
if (interface_exists(TranslatorInterface::class) &&class_exists(LegacyTranslatorProxy::class)) {
823824
$this->assertEquals([newDefinition(LegacyTranslatorProxy::class, [newReference('translator')])],$calls[1][1]);
824825
}else {
825826
$this->assertEquals([newReference('translator')],$calls[1][1]);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp