Make CSRF extension work with Validator translations domain

xsanisty · Feb 25, 2018 · f4e231e · f4e231e
1 parent 079e714
commit f4e231e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/FormServiceProvider.php b/FormServiceProvider.php
@@ -47,7 +47,9 @@ public function register(Container $app)
 
         $app['form.extension.csrf'] = function ($app) {
             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']);

diff --git a/ValidatorServiceProvider.php b/ValidatorServiceProvider.php
@@ -35,7 +35,7 @@ public function register(Container $app)
         $app['validator.builder'] = function ($app) {
             $builder = Validation::createValidatorBuilder();
             $builder->setConstraintValidatorFactory($app['validator.validator_factory']);
-            $builder->setTranslationDomain('validators');
+            $builder->setTranslationDomain($app['validator.translation_domain']);
             $builder->addObjectInitializers($app['validator.object_initializers']);
             $builder->setMetadataFactory($app['validator.mapping.class_metadata_factory']);
             if (isset($app['translator'])) {
@@ -58,5 +58,9 @@ public function register(Container $app)
         };
 
         $app['validator.validator_service_ids'] = [];
+
+        $app['validator.translation_domain'] = function () {
+            return 'validators';
+        };
     }
 }