diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
index fa03960ad4..05ccfe8328 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
@@ -137,6 +137,39 @@ class EntityTypeTest extends BaseTypeTest
]);
}
+ /**
+ * @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 5bc8ffd1b2..caa8844657 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -28,7 +28,7 @@
"symfony/stopwatch": "^3.4|^4.0|^5.0",
"symfony/config": "^4.2|^5.0",
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
- "symfony/form": "^4.4|^5.0",
+ "symfony/form": "^4.4.11|^5.0.11",
"symfony/http-kernel": "^4.3.7",
"symfony/messenger": "^4.4|^5.0",
"symfony/property-access": "^3.4|^4.0|^5.0",
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php
index 43b48bad1a..e94f4defc4 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php
@@ -42,6 +42,10 @@ class ResponseFunctionalTest extends TestCase
*/
public function testCookie($fixture)
{
+ if (\PHP_VERSION_ID >= 80000 && 'cookie_max_age' === $fixture) {
+ $this->markTestSkipped('This fixture produces a fatal error on PHP 8.');
+ }
+
$result = file_get_contents(sprintf('http://localhost:8054/%s.php', $fixture));
$this->assertStringMatchesFormatFile(__DIR__.sprintf('/Fixtures/response-functional/%s.expected', $fixture), $result);
}
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.tr.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.tr.xlf
index a23c652b17..76de2214e6 100644
--- a/src/Symfony/Component/Validator/Resources/translations/validators.tr.xlf
+++ b/src/Symfony/Component/Validator/Resources/translations/validators.tr.xlf
@@ -84,7 +84,7 @@
- Bu değer çok kısa. {{ limit }} karakter veya daha fazla olmaldır.
+ Bu değer çok kısa. {{ limit }} karakter veya daha fazla olmalıdır.