Commita12656e

committed

[FrameworkBundle] decorate the ValidatorBuilder's translator with LegacyTranslatorProxy

1 parentdc2edaf commita12656eCopy full SHA for a12656e

File tree

+18

-2

lines changed

+18

-2

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@`
`97`	`97`	`useSymfony\Component\Translation\Translator;`
`98`	`98`	`useSymfony\Component\Validator\ConstraintValidatorInterface;`
`99`	`99`	`useSymfony\Component\Validator\ObjectInitializerInterface;`
	`100`	`+useSymfony\Component\Validator\Util\LegacyTranslatorProxy;`
`100`	`101`	`useSymfony\Component\WebLink\HttpHeaderSerializer;`
`101`	`102`	`useSymfony\Component\Workflow;`
`102`	`103`	`useSymfony\Component\Workflow\WorkflowInterface;`
`@@ -1107,6 +1108,12 @@ private function registerValidationConfiguration(array $config, ContainerBuilder`
`1107`	`1108`
`1108`	`1109`	`$validatorBuilder =$container->getDefinition('validator.builder');`
`1109`	`1110`
	`1111`	`+if (class_exists(LegacyTranslatorProxy::class)) {`
	`1112`	`+$calls =$validatorBuilder->getMethodCalls();`
	`1113`	`+$calls[1] = ['setTranslator', [newDefinition(LegacyTranslatorProxy::class, [newReference('translator')])]];`
	`1114`	`+$validatorBuilder->setMethodCalls($calls);`
	`1115`	`+ }`
	`1116`	`+`
`1110`	`1117`	`$container->setParameter('validator.translation_domain',$config['translation_domain']);`
`1111`	`1118`
`1112`	`1119`	`$files = ['xml' => [],'yml' => []];`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@`
`50`	`50`	`useSymfony\Component\Serializer\Serializer;`
`51`	`51`	`useSymfony\Component\Translation\DependencyInjection\TranslatorPass;`
`52`	`52`	`useSymfony\Component\Validator\DependencyInjection\AddConstraintValidatorsPass;`
	`53`	`+useSymfony\Component\Validator\Util\LegacyTranslatorProxy;`
`53`	`54`	`useSymfony\Component\Workflow;`
`54`	`55`
`55`	`56`	`abstractclass FrameworkExtensionTestextends TestCase`
`@@ -818,7 +819,11 @@ public function testValidation()`
`818`	`819`	`$this->assertSame('setConstraintValidatorFactory',$calls[0][0]);`
`819`	`820`	`$this->assertEquals([newReference('validator.validator_factory')],$calls[0][1]);`
`820`	`821`	`$this->assertSame('setTranslator',$calls[1][0]);`
`821`		`-$this->assertEquals([newReference('translator')],$calls[1][1]);`
	`822`	`+if (class_exists(LegacyTranslatorProxy::class)) {`
	`823`	`+$this->assertEquals([newDefinition(LegacyTranslatorProxy::class, [newReference('translator')])],$calls[1][1]);`
	`824`	`+ }else {`
	`825`	`+$this->assertEquals([newReference('translator')],$calls[1][1]);`
	`826`	`+ }`
`822`	`827`	`$this->assertSame('setTranslationDomain',$calls[2][0]);`
`823`	`828`	`$this->assertSame(['%validator.translation_domain%'],$calls[2][1]);`
`824`	`829`	`$this->assertSame('addXmlMappings',$calls[3][0]);`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,11 @@ public function setConstraintValidatorFactory(ConstraintValidatorFactoryInterfac`
`258`	`258`	`*/`
`259`	`259`	`publicfunctionsetTranslator(LegacyTranslatorInterface$translator)`
`260`	`260`	`{`
`261`		`-$this->translator =$translatorinstanceof LegacyTranslatorProxy ?$translator->getTranslator() :$translator;`
	`261`	`+$this->translator =$translator;`
	`262`	`+`
	`263`	`+while ($this->translatorinstanceof LegacyTranslatorProxy) {`
	`264`	`+$this->translator =$this->translator->getTranslator();`
	`265`	`+ }`
`262`	`266`
`263`	`267`	`return$this;`
`264`	`268`	`}`

Comments

(0)