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 92a857ec82..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 @@ -58,32 +58,48 @@ {%- else -%} {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) -%}
{{ form_label(form.years) }} | {% endif -%} - {%- if with_months %}{{ form_label(form.months) }} | {% endif -%} - {%- if with_weeks %}{{ form_label(form.weeks) }} | {% endif -%} - {%- if with_days %}{{ form_label(form.days) }} | {% endif -%} - {%- if with_hours %}{{ form_label(form.hours) }} | {% endif -%} - {%- if with_minutes %}{{ form_label(form.minutes) }} | {% endif -%} - {%- if with_seconds %}{{ form_label(form.seconds) }} | {% endif -%} -
---|---|---|---|---|---|---|
{{ form_widget(form.years) }} | {% endif -%} - {%- if with_months %}{{ form_widget(form.months) }} | {% endif -%} - {%- if with_weeks %}{{ form_widget(form.weeks) }} | {% endif -%} - {%- if with_days %}{{ form_widget(form.days) }} | {% endif -%} - {%- if with_hours %}{{ form_widget(form.hours) }} | {% endif -%} - {%- if with_minutes %}{{ form_widget(form.minutes) }} | {% endif -%} - {%- if with_seconds %}{{ form_widget(form.seconds) }} | {% endif -%} -
{{ form_label(form.years) }} | {% endif -%} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig index 0a661a0215..21ebd44a26 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig @@ -136,7 +136,7 @@ {%- else -%}
---|
{{ form_label(form.years) }} | {% endif -%} 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 cf2d7ecbd3..4905c73c68 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -41,7 +41,7 @@ "symfony/doctrine-bridge": "<3.4", "symfony/framework-bundle": "<3.4", "symfony/http-kernel": "<3.4", - "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 @@
---|