8000 Merge branch '2.7' into 2.8 · HeahDude/symfony@1a77a44 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1a77a44

Browse files
fabpotfabpot
committed
Merge branch '2.7' into 2.8
* 2.7: Improved Bootstrap form theme for hidden fields bumped Symfony version to 2.7.11 updated VERSION for 2.7.10 updated CHANGELOG for 2.7.10
2 parents bd588a3 + df4cc40 commit 1a77a44

File tree

4 files changed

+84
-11
lines changed

4 files changed

+84
-11
lines changed

‎CHANGELOG-2.7.md

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,79 @@ in 2.7 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/v2.7.0...v2.7.1
99

10+
* 2.7.10 (2016-02-28)
11+
12+
* bug #17947 Fix - #17676 (backport #17919 to 2.3) (Ocramius)
13+
* bug #17942 Fix bug when using an private aliased factory service (WouterJ)
14+
* bug #17798 [Form] Fix BC break by allowing 'choice_label' option to be 'false' in ChoiceType (HeahDude)
15+
* bug #17542 ChoiceFormField of type "select" could be "disabled" (bouland)
16+
* bug #17602 [HttpFoundation] Fix BinaryFileResponse incorrect behavior with if-range header (bburnichon)
17+
* bug #17760 [Form] fix choice value "false" in ChoiceType (HeahDude)
18+
* bug #17914 [Console] Fix escaping of trailing backslashes (nicolas-grekas)
19+
* bug #17074 Fix constraint validator alias being required (Triiistan)
20+
* bug #17866 [DependencyInjection] replace alias in factories (xabbuh)
21+
* bug #17867 [DependencyInjection] replace alias in factory services (xabbuh)
22+
* bug #17569 [FrameworkBundle] read commands from bundles when accessing list (havvg)
23+
* bug #16987 [FileSystem] Windows fix (flip111)
24+
* bug #17787 [Form] Fix choice placeholder edge cases (Tobion)
25+
* bug #17835 [Yaml] fix default timezone to be UTC (xabbuh)
26+
* bug #17823 [DependencyInjection] fix dumped YAML string (xabbuh)
27+
* bug #17818 [Console] InvalidArgumentException is thrown under wrong condition (robinkanters)
28+
* bug #17819 [HttpKernel] Prevent a fatal error when DebugHandlersListener is used with a kernel with no terminateWithException() method (jakzal)
29+
* bug #17814 [DependencyInjection] fix dumped YAML snytax (xabbuh)
30+
* bug #17099 [Form] Fixed violation mapping if multiple forms are using the same (or part of the same) property path (alekitto)
31+
* bug #17694 [DoctrineBridge] [Form] fix choice_value in EntityType (HeahDude)
32+
* bug #17719 [DependencyInjection] fixed exceptions thrown by get method of ContainerBuilder (lukaszmakuch)
33+
* bug #17742 [DependencyInjection] Fix #16461 Container::set() replace aliases (mnapoli)
34+
* bug #17745 Added more exceptions to singularify method (javiereguiluz)
35+
* bug #17691 Fixed (string) catchable fatal error for PHP Incomplete Class instances (yceruto)
36+
* bug #17766 Fixed (string) catchable fatal error for PHP Incomplete Class instances (yceruto)
37+
* bug #17757 [HttpFoundation] BinaryFileResponse sendContent return as parent. (2.3) (SpacePossum)
38+
* bug #17702 [TwigBridge] forward compatibility with Yaml 3.1 (xabbuh)
39+
* bug #17672 [DependencyInjection][Routing] add files used in FileResource objects (xabbuh)
40+
* bug #17600 Fixed the Bootstrap form theme for inlined checkbox/radio (javiereguiluz)
41+
* bug #17596 [Translation] Add resources from fallback locale to parent catalogue (c960657)
42+
* bug #17605 [FrameworkBundle] remove default null value for asset version (xabbuh)
43+
* bug #17606 [DependencyInjection] pass triggerDeprecationError arg to parent class (xabbuh)
44+
* bug #16956 [DependencyInjection] XmlFileLoader: enforce tags to have a name (xabbuh)
45+
* bug #16265 [BrowserKit] Corrected HTTP_HOST logic (Naktibalda)
46+
* bug #17554 [DependencyInjection] resolve aliases in factories (xabbuh)
47+
* bug #17555 [DependencyInjection] resolve aliases in factory services (xabbuh)
48+
* bug #17511 [Form] ArrayChoiceList can now deal with a null in choices (issei-m)
49+
* bug #17430 [Serializer] Ensure that groups are strings (dunglas)
50+
* bug #15272 [FrameworkBundle] Fix template location for PHP templates (jakzal)
51+
* bug #11232 [Routing] Fixes fatal errors with object resources in AnnotationDirectoryLoader::supports (Tischoi)
52+
* bug #17526 Escape the delimiter in Glob::toRegex (javiereguiluz)
53+
* bug #17527 fixed undefined variable (fabpot)
54+
* bug #15706 [framework-bundle] Added support for the `0.0.0.0/0` trusted proxy (zerkms)
55+
* bug #16274 [HttpKernel] Lookup the response even if the lock was released after two second wait (jakzal)
56+
* bug #17355 [DoctrineBridge][Validator] >= 2.3 Pass association instead of ID as argument (xavismeh)
57+
* bug #17454 Allow absolute URLs to be displayed in the debug toolbar (javiereguiluz)
58+
* bug #16736 [Request] Ignore invalid IP addresses sent by proxies (GromNaN)
59+
* bug #17486 [FrameworkBundle] Throw for missing container extensions (kix)
60+
* bug #16873 Able to load big xml files with DomCrawler (zorn-v)
61+
* bug #16897 [Form] Fix constraints could be null if not set (DZunke)
62+
* bug #16912 [Translation][Writer] avoid calling setBackup if the dumper is not FileDumper (aitboudad)
63+
* bug #17505 sort bundles in config:dump-reference command (xabbuh)
64+
* bug #17514 [Asset] Add defaultNull to version configuration (ewgRa)
65+
* bug #16511 [Asset] Ability to set empty version strategy in packages (ewgRa)
66+
* bug #17503 [Asset] CLI: use request context to generate absolute URLs (xabbuh)
67+
* bug #17478 [HttpFoundation] Do not overwrite the Authorization header if it is already set (jakzal)
68+
* bug #17461 [Yaml] tag for dumped PHP objects must be a local one (xabbuh)
69+
* bug #17456 [DX] Remove default match from AbstractConfigCommand::findExtension (kix)
70+
* bug #17424 [Process] Update in 2.7 for stream-based output storage (romainneutron)
71+
* bug #17423 [Process] Use stream based storage to avoid memory issues (romainneutron)
72+
* bug #17406 [Form] ChoiceType: Fix a notice when 'choices' normalizer is replaced (paradajozsef)
73+
* bug #17433 [FrameworkBundle] Don't log twice with the error handler (nicolas-grekas)
74+
* bug #17418 Fixed Bootstrap form theme form "reset" buttons (javiereguiluz)
75+
* bug #17404 fix merge 2.3 into 2.7 for SecureRandom dependency (Tobion)
76+
* bug #17373 [SecurityBundle] fix SecureRandom service constructor args (Tobion)
77+
* bug #17380 [TwigBridge] Use label_format option for checkbox and radio labels (enumag)
78+
* bug #17377 Fix performance (PHP5) and memory (PHP7) issues when using token_get_all (nicolas-grekas, peteward)
79+
* bug #17389 [Routing] Fixed correct class name in thrown exception (fixes #17388) (robinvdvleuten)
80+
* bug #17358 [ClassLoader] Use symfony/polyfill-apcu (nicolas-grekas)
81+
* bug #17370 [HttpFoundation][Cookie] Cookie DateTimeInterface fix (wildewouter)
82+
1083
* 2.7.9 (2016-01-14)
1184

1285
* security #17359 do not ship with a custom rng implementation (xabbuh, fabpot)

‎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.7|~3.0.0",
2424
"symfony/finder": "~2.3|~3.0.0",
25-
"symfony/form": "~2.8",
25+
"symfony/form": "~2.8.3",
2626
"symfony/http-kernel": "~2.8|~3.0.0",
2727
"symfony/polyfill-intl-icu": "~1.0",
2828
"symfony/routing": "~2.2|~3.0.0",

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ public function testSingleChoiceExpanded()
711711
./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
712712
]
713713
]
714-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
714+
/following-sibling::input[@type="hidden"][@id="name__token"]
715715
]
716716
'
717717
);
@@ -871,7 +871,7 @@ public function testSingleChoiceExpandedWithoutTranslation()
871871
./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
872872
]
873873
]
874-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
874+
/following-sibling::input[@type="hidden"][@id="name__token"]
875875
]
876876
'
877877
);
@@ -910,7 +910,7 @@ public function testSingleChoiceExpandedAttributes()
910910
./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]'.$classPart.'
911911
]
912912
]
913-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
913+
/following-sibling::input[@type="hidden"][@id="name__token"]
914914
]
915915
'
916916
);
@@ -957,7 +957,7 @@ public function testSingleChoiceExpandedWithPlaceholder()
957957
./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]
958958
]
959959
]
960-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
960+
/following-sibling::input[@type="hidden"][@id="name__token"]
961961
]
962962
'
963963
);
@@ -1041,7 +1041,7 @@ public function testSingleChoiceExpandedWithBooleanValue()
10411041
./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]
10421042
]
10431043
]
1044-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
1044+
/following-sibling::input[@type="hidden"][@id="name__token"]
10451045
]
10461046
'
10471047
);
@@ -1087,7 +1087,7 @@ public function testMultipleChoiceExpanded()
10871087
./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
10881088
]
10891089
]
1090-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
1090+
/following-sibling::input[@type="hidden"][@id="name__token"]
10911091
]
10921092
'
10931093
);
@@ -1257,7 +1257,7 @@ public function testMultipleChoiceExpandedWithoutTranslation()
12571257
./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
12581258
]
12591259
]
1260-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
1260+
/following-sibling::input[@type="hidden"][@id="name__token"]
12611261
]
12621262
'
12631263
);
@@ -1306,7 +1306,7 @@ public function testMultipleChoiceExpandedAttributes()
13061306
./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
13071307
]
13081308
]
1309-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
1309+
/following-sibling::input[@type="hidden"][@id="name__token"]
13101310
]
13111311
'
13121312
);
@@ -1808,7 +1808,7 @@ public function testHidden()
18081808
'/input
18091809
[@type="hidden"]
18101810
[@name="name"]
1811-
[@class="my&class form-control"]
1811+
[@class="my&class"]
18121812
[@value="foo&bar"]
18131813
'
18141814
);

0 commit comments

Comments
 (0)
0