[FrameworkBundle][Validator] Add framework.validation.disable_translation config

alexandre-daubois · alexandre-daubois · commit 15c853a9067c · 2023-06-27T16:06:28.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.4
+---
+
+ * Add `framework.validation.disable_translation` option
+
 6.3
 ---
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1021,6 +1021,9 @@ private function addValidationSection(ArrayNodeDefinition $rootNode, callable $e
                                 ->end()
                             ->end()
                         ->end()
+                        ->booleanNode('disable_translation')
+                            ->defaultFalse()
+                        ->end()
                         ->arrayNode('auto_mapping')
                             ->info('A collection of namespaces for which auto-mapping will be enabled by default, or null to opt-in with the EnableAutoMapping constraint.')
                             ->example([
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.php
@@ -119,4 +119,11 @@
             ])
             ->tag('validator.auto_mapper')
     ;
+
+    if (param('validator.disable_translation') === true) {
+        $container->services()
+            ->get('validator.builder')
+            ->call('disableTranslation')
+        ;
+    }
 };
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -547,6 +547,7 @@ protected static function getBundleDefaultConfig()
                 'enable_annotations' => !class_exists(FullStack::class),
                 'static_method' => ['loadValidatorMetadata'],
                 'translation_domain' => 'validators',
+                'disable_translation' => false,
                 'mapping' => [
                     'paths' => [],
                 ],
diff --git a/src/Symfony/Component/Validator/Context/ExecutionContext.php b/src/Symfony/Component/Validator/Context/ExecutionContext.php
@@ -45,7 +45,7 @@ class ExecutionContext implements ExecutionContextInterface
     private mixed $root;
 
     private TranslatorInterface $translator;
-    private ?string $translationDomain;
+    private string|false|null $translationDomain;
 
     /**
      * The violations generated in the current context.
@@ -111,7 +111,7 @@ class ExecutionContext implements ExecutionContextInterface
     /**
      * @internal Called by {@link ExecutionContextFactory}. Should not be used in user code.
      */
-    public function __construct(ValidatorInterface $validator, mixed $root, TranslatorInterface $translator, string $translationDomain = null)
+    public function __construct(ValidatorInterface $validator, mixed $root, TranslatorInterface $translator, string|false $translationDomain = null)
     {
         $this->validator = $validator;
         $this->root = $root;
diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php b/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php
@@ -24,9 +24,9 @@
 class ExecutionContextFactory implements ExecutionContextFactoryInterface
 {
     private TranslatorInterface $translator;
-    private ?string $translationDomain;
+    private string|false|null $translationDomain;
 
-    public function __construct(TranslatorInterface $translator, string $translationDomain = null)
+    public function __construct(TranslatorInterface $translator, string|false $translationDomain = null)
     {
         $this->translator = $translator;
         $this->translationDomain = $translationDomain;
diff --git a/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php b/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
@@ -140,6 +140,11 @@ public function testSetTranslationDomain()
         $this->assertSame($this->builder, $this->builder->setTranslationDomain('TRANS_DOMAIN'));
     }
 
+    public function testDisableTranslation()
+    {
+        $this->assertSame($this->builder, $this->builder->disableTranslation());
+    }
+
     public function testGetValidator()
     {
         $this->assertInstanceOf(RecursiveValidator::class, $this->builder->getValidator());
diff --git a/src/Symfony/Component/Validator/ValidatorBuilder.php b/src/Symfony/Component/Validator/ValidatorBuilder.php
@@ -54,7 +54,7 @@ class ValidatorBuilder
     private ConstraintValidatorFactoryInterface $validatorFactory;
     private ?CacheItemPoolInterface $mappingCache = null;
     private ?TranslatorInterface $translator = null;
-    private ?string $translationDomain = null;
+    private string|false|null $translationDomain = null;
 
     /**
      * Adds an object initializer to the validator.
@@ -307,6 +307,16 @@ public function setTranslationDomain(?string $translationDomain): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
+    public function disableTranslation(): static
+    {
+        $this->translationDomain = false;
+
+        return $this;
+    }
+
     /**
      * @return $this
      */

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@`
`24`	`24`	`class ExecutionContextFactory implements ExecutionContextFactoryInterface`
`25`	`25`	`{`
`26`	`26`	`private TranslatorInterface $translator;`
`27`		`- private ?string $translationDomain;`
	`27`	`+ private string\|false\|null $translationDomain;`
`28`	`28`
`29`		`- public function __construct(TranslatorInterface $translator, string $translationDomain = null)`
	`29`	`+ public function __construct(TranslatorInterface $translator, string\|false $translationDomain = null)`
`30`	`30`	`{`
`31`	`31`	`$this->translator = $translator;`
`32`	`32`	`$this->translationDomain = $translationDomain;`
Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,11 @@ public function testSetTranslationDomain()`
`140`	`140`	`$this->assertSame($this->builder, $this->builder->setTranslationDomain('TRANS_DOMAIN'));`
`141`	`141`	`}`
`142`	`142`
	`143`	`+ public function testDisableTranslation()`
	`144`	`+ {`
	`145`	`+ $this->assertSame($this->builder, $this->builder->disableTranslation());`
	`146`	`+ }`
	`147`	`+`
`143`	`148`	`public function testGetValidator()`
`144`	`149`	`{`
`145`	`150`	`$this->assertInstanceOf(RecursiveValidator::class, $this->builder->getValidator());`