Merge branch '3.0'

* 3.0:
  Improved Bootstrap form theme for hidden fields
  [WebProfilerBundle] Fix design issue in profiler when having errors in forms
  bumped Symfony version to 3.0.4
  updated VERSION for 3.0.3
  updated CHANGELOG for 3.0.3
  bumped Symfony version to 2.8.4
  updated VERSION for 2.8.3
  updated CHANGELOG for 2.8.3
  bumped Symfony version to 2.7.11
  updated VERSION for 2.7.10
  updated CHANGELOG for 2.7.10
This commit is contained in:
Fabien Potencier 2016-03-01 08:33:16 +01:00
commit 2a92050125
5 changed files with 58 additions and 15 deletions

View File

@ -7,6 +7,49 @@ in 3.0 minor versions.
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.0.0...v3.0.1
* 3.0.3 (2016-02-28)
* bug #17919 #17676 - making the proxy instantiation compatible with ProxyManager 2.x by detecting proxy features (Ocramius)
* bug #17947 Fix - #17676 (backport #17919 to 2.3) (Ocramius)
* bug #17942 Fix bug when using an private aliased factory service (WouterJ)
* bug #17798 [Form] Fix BC break by allowing 'choice_label' option to be 'false' in ChoiceType (HeahDude)
* bug #17542 ChoiceFormField of type "select" could be "disabled" (bouland)
* bug #17602 [HttpFoundation] Fix BinaryFileResponse incorrect behavior with if-range header (bburnichon)
* bug #17760 [Form] fix choice value "false" in ChoiceType (HeahDude)
* bug #17914 [Console] Fix escaping of trailing backslashes (nicolas-grekas)
* bug #17074 Fix constraint validator alias being required (Triiistan)
* bug #17866 [DependencyInjection] replace alias in factories (xabbuh)
* bug #17867 [DependencyInjection] replace alias in factory services (xabbuh)
* bug #17865 [FrameworkBundle] disable the assets helper when assets are disabled (xabbuh)
* bug #17860 Fixed the antialiasing of the toolbar text (javiereguiluz)
* bug #17569 [FrameworkBundle] read commands from bundles when accessing list (havvg)
* bug #16987 [FileSystem] Windows fix (flip111)
* bug #17787 [Form] Fix choice placeholder edge cases (Tobion)
* bug #17835 [Yaml] fix default timezone to be UTC (xabbuh)
* bug #17823 [DependencyInjection] fix dumped YAML string (xabbuh)
* bug #17818 [Console] InvalidArgumentException is thrown under wrong condition (robinkanters)
* bug #17819 [HttpKernel] Prevent a fatal error when DebugHandlersListener is used with a kernel with no terminateWithException() method (jakzal)
* bug #17814 [DependencyInjection] fix dumped YAML snytax (xabbuh)
* bug #17099 [Form] Fixed violation mapping if multiple forms are using the same (or part of the same) property path (alekitto)
* bug #17694 [DoctrineBridge] [Form] fix choice_value in EntityType (HeahDude)
* bug #17790 [Config] Fix EnumNodeDefinition to allow building enum nodes with one element (ogizanagi)
* bug #17729 [Yaml] properly parse lists in object maps (xabbuh)
* bug #17719 [DependencyInjection] fixed exceptions thrown by get method of ContainerBuilder (lukaszmakuch)
* bug #17742 [DependencyInjection] Fix #16461 Container::set() replace aliases (mnapoli)
* bug #17745 Added more exceptions to singularify method (javiereguiluz)
* bug #17691 Fixed (string) catchable fatal error for PHP Incomplete Class instances (yceruto)
* bug #17766 Fixed (string) catchable fatal error for PHP Incomplete Class instances (yceruto)
* bug #17757 [HttpFoundation] BinaryFileResponse sendContent return as parent. (2.3) (SpacePossum)
* bug #17748 [DomCrawler] Remove the overridden getHash() method to prevent problems when cloning the crawler (jakzal)
* bug #17725 [WebProfilerBundle] Add width attribute on SVG - Fix toolbar profiler on microsoft edge (AlexandrePavy)
* bug #17703 [FrameworkBundle] Support autowiring for TranslationInterface (dunglas)
* bug #17613 [WebProfiler] Fixed logo and menu profiler for Microsoft Edge (WhiteEagle88)
* bug #17702 [TwigBridge] forward compatibility with Yaml 3.1 (xabbuh)
* bug #17673 [Routing] add files used in FileResource objects (xabbuh)
* bug #17672 [DependencyInjection][Routing] add files used in FileResource objects (xabbuh)
* bug #17669 [Console] remove readline support (xabbuh)
* bug #17600 Fixed the Bootstrap form theme for inlined checkbox/radio (javiereguiluz)
* 3.0.2 (2016-02-03)
* bug #17658 [FrameworkBundle] fix assets and templating tests (xabbuh)

View File

@ -3,7 +3,7 @@
{# Widgets #}
{% block form_widget_simple -%}
{% if type is not defined or 'file' != type %}
{% if type is not defined or type not in ['file', 'hidden'] %}
{%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) -%}
{% endif %}
{{- parent() -}}

View File

@ -22,7 +22,7 @@
"require-dev": {
"symfony/asset": "~2.8|~3.0",
"symfony/finder": "~2.8|~3.0",
"symfony/form": "~2.8|~3.0",
"symfony/form": "~2.8.3|~3.0",
"symfony/http-kernel": "~2.8|~3.0",
"symfony/polyfill-intl-icu": "~1.0",
"symfony/routing": "~2.8|~3.0",

View File

@ -427,6 +427,10 @@
{% import _self as tree %}
<li>
<div class="tree-inner" data-tab-target-id="{{ data.id }}-details">
{% if data.errors is defined and data.errors|length > 0 %}
<div class="badge-error">{{ data.errors|length }}</div>
{% endif %}
{% if data.children is not empty %}
<a class="toggle-button" data-toggle-target-id="{{ data.id }}-children" href="#"><span class="toggle-icon"></span></a>
{% else %}
@ -434,10 +438,6 @@
{% endif %}
{{ name|default('(no name)') }} {% if data.type_class is defined %}[<abbr title="{{ data.type_class }}">{{ data.type_class|split('\\')|last }}</abbr>]{% endif %}
{% if data.errors is defined and data.errors|length > 0 %}
<div class="badge-error">{{ data.errors|length }}</div>
{% endif %}
</div>
{% if data.children is not empty %}

View File

@ -687,7 +687,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
]
]
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
/following-sibling::input[@type="hidden"][@id="name__token"]
]
'
);
@ -843,7 +843,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
]
]
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
/following-sibling::input[@type="hidden"][@id="name__token"]
]
'
);
@ -879,7 +879,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)][@class="foo&bar"]
]
]
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
/following-sibling::input[@type="hidden"][@id="name__token"]
]
'
);
@ -925,7 +925,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]
]
]
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
/following-sibling::input[@type="hidden"][@id="name__token"]
]
'
);
@ -1007,7 +1007,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]
]
]
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
/following-sibling::input[@type="hidden"][@id="name__token"]
]
'
);
@ -1052,7 +1052,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
]
]
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
/following-sibling::input[@type="hidden"][@id="name__token"]
]
'
);
@ -1218,7 +1218,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
]
]
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
/following-sibling::input[@type="hidden"][@id="name__token"]
]
'
);
@ -1264,7 +1264,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
]
]
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
/following-sibling::input[@type="hidden"][@id="name__token"]
]
'
);
@ -1766,7 +1766,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
'/input
[@type="hidden"]
[@name="name"]
[@class="my&class form-control"]
[@class="my&class"]
[@value="foo&bar"]
'
);