Commit 935caf7b authored by Haralan Dobrev's avatar Haralan Dobrev Committed by Fabien Potencier

Make CSRF extension work with Validator translations domain

parent eb559d4c
...@@ -47,7 +47,9 @@ class FormServiceProvider implements ServiceProviderInterface ...@@ -47,7 +47,9 @@ class FormServiceProvider implements ServiceProviderInterface
$app['form.extension.csrf'] = function ($app) { $app['form.extension.csrf'] = function ($app) {
if (isset($app['translator'])) { if (isset($app['translator'])) {
return new CsrfExtension($app['csrf.token_manager'], $app['translator']); $translationDomain = isset($app['validator.translation_domain']) ? $app['validator.translation_domain'] : null;
return new CsrfExtension($app['csrf.token_manager'], $app['translator'], $translationDomain);
} }
return new CsrfExtension($app['csrf.token_manager']); return new CsrfExtension($app['csrf.token_manager']);
......
...@@ -35,7 +35,7 @@ class ValidatorServiceProvider implements ServiceProviderInterface ...@@ -35,7 +35,7 @@ class ValidatorServiceProvider implements ServiceProviderInterface
$app['validator.builder'] = function ($app) { $app['validator.builder'] = function ($app) {
$builder = Validation::createValidatorBuilder(); $builder = Validation::createValidatorBuilder();
$builder->setConstraintValidatorFactory($app['validator.validator_factory']); $builder->setConstraintValidatorFactory($app['validator.validator_factory']);
$builder->setTranslationDomain('validators'); $builder->setTranslationDomain($app['validator.translation_domain']);
$builder->addObjectInitializers($app['validator.object_initializers']); $builder->addObjectInitializers($app['validator.object_initializers']);
$builder->setMetadataFactory($app['validator.mapping.class_metadata_factory']); $builder->setMetadataFactory($app['validator.mapping.class_metadata_factory']);
if (isset($app['translator'])) { if (isset($app['translator'])) {
...@@ -58,5 +58,9 @@ class ValidatorServiceProvider implements ServiceProviderInterface ...@@ -58,5 +58,9 @@ class ValidatorServiceProvider implements ServiceProviderInterface
}; };
$app['validator.validator_service_ids'] = []; $app['validator.validator_service_ids'] = [];
$app['validator.translation_domain'] = function () {
return 'validators';
};
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment