Merge branch '2.6' into 2.7
* 2.6: [Form] fixed form tests when using 2.7 deps [TwigBridge] Fix bootstrap rendering when user explicitly use form_label Fixed HtmlDumper with long string Conflicts: src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
This commit is contained in:
commit
3ed00a870a
@ -156,6 +156,8 @@
|
|||||||
{%- endblock radio_label %}
|
{%- endblock radio_label %}
|
||||||
|
|
||||||
{% block checkbox_radio_label %}
|
{% block checkbox_radio_label %}
|
||||||
|
{# Do no display the label if widget is not defined in order to prevent double label rendering #}
|
||||||
|
{% if widget is defined %}
|
||||||
{% if required %}
|
{% if required %}
|
||||||
{% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) %}
|
{% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
@ -169,6 +171,7 @@
|
|||||||
{{ widget|raw }}
|
{{ widget|raw }}
|
||||||
{{ label|trans({}, translation_domain) }}
|
{{ label|trans({}, translation_domain) }}
|
||||||
</label>
|
</label>
|
||||||
|
{% endif %}
|
||||||
{% endblock checkbox_radio_label %}
|
{% endblock checkbox_radio_label %}
|
||||||
|
|
||||||
{# Rows #}
|
{# Rows #}
|
||||||
|
@ -18,6 +18,7 @@ use Symfony\Component\Form\FormInterface;
|
|||||||
use Symfony\Component\Form\Extension\Validator\Constraints\Form;
|
use Symfony\Component\Form\Extension\Validator\Constraints\Form;
|
||||||
use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
|
use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
|
||||||
use Symfony\Component\Form\SubmitButtonBuilder;
|
use Symfony\Component\Form\SubmitButtonBuilder;
|
||||||
|
use Symfony\Component\Validator\Context\ExecutionContextInterface;
|
||||||
use Symfony\Component\Validator\Constraints\NotNull;
|
use Symfony\Component\Validator\Constraints\NotNull;
|
||||||
use Symfony\Component\Validator\Constraints\NotBlank;
|
use Symfony\Component\Validator\Constraints\NotBlank;
|
||||||
use Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest;
|
use Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest;
|
||||||
|
@ -31,7 +31,7 @@ class HtmlDumper extends CliDumper
|
|||||||
protected $headerIsDumped = false;
|
protected $headerIsDumped = false;
|
||||||
protected $lastDepth = -1;
|
protected $lastDepth = -1;
|
||||||
protected $styles = array(
|
protected $styles = array(
|
||||||
'default' => 'background-color:#18171B; color:#FF8400; line-height:1.2em; font:12px Menlo, Monaco, Consolas, monospace',
|
'default' => 'background-color:#18171B; color:#FF8400; line-height:1.2em; font:12px Menlo, Monaco, Consolas, monospace; word-wrap: break-word; white-space: pre-wrap',
|
||||||
'num' => 'font-weight:bold; color:#1299DA',
|
'num' => 'font-weight:bold; color:#1299DA',
|
||||||
'const' => 'font-weight:bold',
|
'const' => 'font-weight:bold',
|
||||||
'str' => 'font-weight:bold; color:#56DB3A',
|
'str' => 'font-weight:bold; color:#56DB3A',
|
||||||
|
Reference in New Issue
Block a user