diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
index 4d5691e22333a..1d382a95aa65c 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
@@ -138,6 +138,39 @@ public function testInvalidClassOption()
]);
}
+ /**
+ * @dataProvider choiceTranslationDomainProvider
+ */
+ public function testChoiceTranslationDomainIsDisabledByDefault($expanded)
+ {
+ $entity1 = new SingleIntIdEntity(1, 'Foo');
+
+ $this->persist([$entity1]);
+
+ $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
+ 'choices' => [
+ $entity1,
+ ],
+ 'class' => SingleIntIdEntity::class,
+ 'em' => 'default',
+ 'expanded' => $expanded,
+ ]);
+
+ if ($expanded) {
+ $this->assertFalse($field->get('1')->getConfig()->getOption('translation_domain'));
+ } else {
+ $this->assertFalse($field->getConfig()->getOption('choice_translation_domain'));
+ }
+ }
+
+ public function choiceTranslationDomainProvider()
+ {
+ return [
+ [false],
+ [true],
+ ];
+ }
+
public function testSetDataToUninitializedEntityWithNonRequired()
{
$entity1 = new SingleIntIdEntity(1, 'Foo');
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index d33ea16ea6920..0ad66ccf72a2c 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -25,7 +25,7 @@
"doctrine/annotations": "~1.7",
"symfony/stopwatch": "~2.8|~3.0|~4.0",
"symfony/dependency-injection": "~3.4|~4.0",
- "symfony/form": "^3.3.10|~4.0",
+ "symfony/form": "^3.4.43|~4.4.11",
"symfony/http-kernel": "~2.8|~3.0|~4.0",
"symfony/property-access": "~2.8|~3.0|~4.0",
"symfony/property-info": "~2.8|3.0|~4.0",
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy