Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2a92050

Browse files
fabpotfabpot
committed
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
2 parents 813e61a + e93ad7d commit 2a92050

File tree

5 files changed

+58
-15
lines changed

5 files changed

+58
-15
lines changed

‎CHANGELOG-3.0.md

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,49 @@ in 3.0 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.0.0...v3.0.1
99

10+
* 3.0.3 (2016-02-28)
11+
12+
* bug #17919 #17676 - making the proxy instantiation compatible with ProxyManager 2.x by detecting proxy features (Ocramius)
13+
* bug #17947 Fix - #17676 (backport #17919 to 2.3) (Ocramius)
14+
* bug #17942 Fix bug when using an private aliased factory service (WouterJ)
15+
* bug #17798 [Form] Fix BC break by allowing 'choice_label' option to be 'false' in ChoiceType (HeahDude)
16+
* bug #17542 ChoiceFormField of type "select" could be "disabled" (bouland)
17+
* bug #17602 [HttpFoundation] Fix BinaryFileResponse incorrect behavior with if-range header (bburnichon)
18+
* bug #17760 [Form] fix choice value "false" in ChoiceType (HeahDude)
19+
* bug #17914 [Console] Fix escaping of trailing backslashes (nicolas-grekas)
20+
* bug #17074 Fix constraint validator alias being required (Triiistan)
21+
* bug #17866 [DependencyInjection] replace alias in factories (xabbuh)
22+
* bug #17867 [DependencyInjection] replace alias in factory services (xabbuh)
23+
* bug #17865 [FrameworkBundle] disable the assets helper when assets are disabled (xabbuh)
24+
* bug #17860 Fixed the antialiasing of the toolbar text (javiereguiluz)
25+
* bug #17569 [FrameworkBundle] read commands from bundles when accessing list (havvg)
26+
* bug #16987 [FileSystem] Windows fix (flip111)
27+
* bug #17787 [Form] Fix choice placeholder edge cases (Tobion)
28+
* bug #17835 [Yaml] fix default timezone to be UTC (xabbuh)
29+
* bug #17823 [DependencyInjection] fix dumped YAML string (xabbuh)
30+
* bug #17818 [Console] InvalidArgumentException is thrown under wrong condition (robinkanters)
31+
* bug #17819 [HttpKernel] Prevent a fatal error when DebugHandlersListener is used with a kernel with no terminateWithException() method (jakzal)
32+
* bug #17814 [DependencyInjection] fix dumped YAML snytax (xabbuh)
33+
* bug #17099 [Form] Fixed violation mapping if multiple forms are using the same (or part of the same) property path (alekitto)
34+
* bug #17694 [DoctrineBridge] [Form] fix choice_value in EntityType (HeahDude)
35+
* bug #17790 [Config] Fix EnumNodeDefinition to allow building enum nodes with one element (ogizanagi)
36+
* bug #17729 [Yaml] properly parse lists in object maps (xabbuh)
37+
* bug #17719 [DependencyInjection] fixed exceptions thrown by get method of ContainerBuilder (lukaszmakuch)
38+
* bug #17742 [DependencyInjection] Fix #16461 Container::set() replace aliases (mnapoli)
39+
* bug #17745 Added more exceptions to singularify method (javiereguiluz)
40+
* bug #17691 Fixed (string) catchable fatal error for PHP Incomplete Class instances (yceruto)
41+
* bug #17766 Fixed (string) catchable fatal error for PHP Incomplete Class instances (yceruto)
42+
* bug #17757 [HttpFoundation] BinaryFileResponse sendContent return as parent. (2.3) (SpacePossum)
43+
* bug #17748 [DomCrawler] Remove the overridden getHash() method to prevent problems when cloning the crawler (jakzal)
44+
* bug #17725 [WebProfilerBundle] Add width attribute on SVG - Fix toolbar profiler on microsoft edge (AlexandrePavy)
45+
* bug #17703 [FrameworkBundle] Support autowiring for TranslationInterface (dunglas)
46+
* bug #17613 [WebProfiler] Fixed logo and menu profiler for Microsoft Edge (WhiteEagle88)
47+
* bug #17702 [TwigBridge] forward compatibility with Yaml 3.1 (xabbuh)
48+
* bug #17673 [Routing] add files used in FileResource objects (xabbuh)
49+
* bug #17672 [DependencyInjection][Routing] add files used in FileResource objects (xabbuh)
50+
* bug #17669 [Console] remove readline support (xabbuh)
51+
* bug #17600 Fixed the Bootstrap form theme for inlined checkbox/radio (javiereguiluz)
52+
1053
* 3.0.2 (2016-02-03)
1154

1255
* bug #17658 [FrameworkBundle] fix assets and templating tests (xabbuh)

‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{# Widgets #}
44

55
{% block form_widget_simple -%}
6-
{% if type is not defined or 'file' != type %}
6+
{% if type is not defined or type not in ['file', 'hidden'] %}
77
{%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) -%}
88
{% endif %}
99
{{- parent() -}}

‎src/Symfony/Bridge/Twig/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"require-dev": {
2323
"symfony/asset": "~2.8|~3.0",
2424
"symfony/finder": "~2.8|~3.0",
25-
"symfony/form": "~2.8|~3.0",
25+
"symfony/form": "~2.8.3|~3.0",
2626
"symfony/http-kernel": "~2.8|~3.0",
2727
"symfony/polyfill-intl-icu": "~1.0",
2828
"symfony/routing": "~2.8|~3.0",

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -427,17 +427,17 @@
427427
{% import _self as tree %}
428428
<li>
429429
<div class="tree-inner" data-tab-target-id="{{ data.id }}-details">
430+
{% if data.errors is defined and data.errors|length > 0 %}
431+
<div class="badge-error">{{ data.errors|length }}</div>
432+
{% endif %}
433+
430434
{% if data.children is not empty %}
431435
<a class="toggle-button" data-toggle-target-id="{{ data.id }}-children" href="#"><span class="toggle-icon"></span></a>
432436
{% else %}
433437
<div class="toggle-icon empty"></div>
434438
{% endif %}
435439

436440
{{ name|default('(no name)') }} {% if data.type_class is defined %}[<abbr title="{{ data.type_class }}">{{ data.type_class|split('\\')|last }}</abbr>]{% endif %}
437-
438-
{% if data.errors is defined and data.errors|length > 0 %}
439-
<div class="badge-error">{{ data.errors|length }}</div>
440-
{% endif %}
441441
</div>
442442

443443
{% if data.children is not empty %}

‎src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ public function testSingleChoiceExpanded()
687687
./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
688688
]
689689
]
690-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
690+
/following-sibling::input[@type="hidden"][@id="name__token"]
691691
]
692692
'
693693
);
@@ -843,7 +843,7 @@ public function testSingleChoiceExpandedWithoutTranslation()
843843
./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
844844
]
845845
]
846-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
846+
/following-sibling::input[@type="hidden"][@id="name__token"]
847847
]
848848
'
849849
);
@@ -879,7 +879,7 @@ public function testSingleChoiceExpandedAttributes()
879879
./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)][@class="foo&bar"]
880880
]
881881
]
882-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
882+
/following-sibling::input[@type="hidden"][@id="name__token"]
883883
]
884884
'
885885
);
@@ -925,7 +925,7 @@ public function testSingleChoiceExpandedWithPlaceholder()
925925
./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]
926926
]
927927
]
928-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
928+
/following-sibling::input[@type="hidden"][@id="name__token"]
929929
]
930930
'
931931
);
@@ -1007,7 +1007,7 @@ public function testSingleChoiceExpandedWithBooleanValue()
10071007
./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]
10081008
]
10091009
]
1010-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
1010+
/following-sibling::input[@type="hidden"][@id="name__token"]
10111011
]
10121012
'
10131013
);
@@ -1052,7 +1052,7 @@ public function testMultipleChoiceExpanded()
10521052
./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
10531053
]
10541054
]
1055-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
1055+
/following-sibling::input[@type="hidden"][@id="name__token"]
10561056
]
10571057
'
10581058
);
@@ -1218,7 +1218,7 @@ public function testMultipleChoiceExpandedWithoutTranslation()
12181218
./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
12191219
]
12201220
]
1221-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
1221+
/following-sibling::input[@type="hidden"][@id="name__token"]
12221222
]
12231223
'
12241224
);
@@ -1264,7 +1264,7 @@ public function testMultipleChoiceExpandedAttributes()
12641264
./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
12651265
]
12661266
]
1267-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
1267+
/following-sibling::input[@type="hidden"][@id="name__token"]
12681268
]
12691269
'
12701270
);
@@ -1766,7 +1766,7 @@ public function testHidden()
17661766
'/input
17671767
[@type="hidden"]
17681768
[@name="name"]
1769-
[@class="my&class form-control"]
1769+
[@class="my&class"]
17701770
[@value="foo&bar"]
17711771
'
17721772
);

0 commit comments

Comments
 (0)