diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
index 726424d135..a3484d9036 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
@@ -264,7 +264,7 @@
diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php
index 5934479a90..e8ede167b3 100644
--- a/src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php
@@ -34,7 +34,10 @@ abstract class AbstractBootstrap4HorizontalLayoutTest extends AbstractBootstrap4
[
./div[
./ul
- [./li[.="[trans]Error![/trans]"]]
+ [./li
+ [./span[.="[trans]Error[/trans]"]]
+ [./span[.="[trans]Error![/trans]"]]
+ ]
[count(./li)=1]
]
]
diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php
index 89a95fca8d..ec97577818 100644
--- a/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php
@@ -34,7 +34,10 @@ abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest
[
./div[
./ul
- [./li[.="[trans]Error![/trans]"]]
+ [./li
+ [./span[.="[trans]Error[/trans]"]]
+ [./span[.="[trans]Error![/trans]"]]
+ ]
[count(./li)=1]
]
]
@@ -166,9 +169,12 @@ abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest
[@class="list-unstyled mb-0"]
[
./li
- [.="[trans]Error 1[/trans]"]
+ [./span[.="[trans]Error[/trans]"]]
+ [./span[.="[trans]Error 1[/trans]"]]
+
/following-sibling::li
- [.="[trans]Error 2[/trans]"]
+ [./span[.="[trans]Error[/trans]"]]
+ [./span[.="[trans]Error 2[/trans]"]]
]
[count(./li)=2]
]
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
index f9836b8ac0..3d33c190ca 100644
--- a/src/Symfony/Component/Form/composer.json
+++ b/src/Symfony/Component/Form/composer.json
@@ -41,7 +41,7 @@
"symfony/doctrine-bridge": "<2.7",
"symfony/framework-bundle": "<3.4",
"symfony/http-kernel": "<3.3.5",
- "symfony/twig-bridge": "<3.4"
+ "symfony/twig-bridge": "<3.4.5|<4.0.5,>=4.0"
},
"suggest": {
"symfony/validator": "For form validation.",
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf
index a33eb82391..dc6f95ff13 100644
--- a/src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf
+++ b/src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf
@@ -314,6 +314,10 @@
This is not a valid Business Identifier Code (BIC).
Невалиден бизнес идентификационен код (BIC).
+
+ Error
+ Грешка
+