Commit d1230dc
committed
Merge branch '7.4' into 8.0
* 7.4: (28 commits)
[Console] Rename `#[Input]` to `#[MapInput]`
[FrameworkBundle] Fix support of dumping workflow when workflow is decorated by TraceableWorkflow
[JsonStreamer] Fix documentation link in README
[Meta] Better exception when symfony link cannot read a JSON
[Form] Add new `active_at`, `not_active_at` and `legal_tender` options to `CurrencyType`
[Intl] Support time in generated data in currencies validity
[Validator] Improve and complete Japanese translations
[HtmlSanitizer] Remove redundant assignment to promoted property $config in constructor
[Validator] Fix Polish translation for word count validation message
[DependencyInjection][Routing] Deprecate XML configuration format
[Validator] Review and fix Czech translation
[DependencyInjection][Routing] Handle declaring services and routes using PHP arrays that follow the same shape as corresponding yaml files
[Mailer][MailJet] Fix forbidden headers case-sensitive comparison
[DependencyInjection][Config][Routing] Deprecate using `$this` or the internal scope of the loader from PHP config files
[Config] Add array-shapes to generated config builders
[DependencyInjection] Handle returning arrays and config-builders from config files
[WebProfilerBundle] Simplify toolbar CSS
do not use deprecated PHPUnit features
replace PHPUnit annotation with attribute
[Serializer] xml empty array encoding
...File tree
11 files changed
+23
-18
lines changed- Tests
- DependencyInjection
- Fixtures/php
- Functional/Bundle/FirewallEntryPointBundle
- DependencyInjection
- Resources/config
11 files changed
+23
-18
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
| 15 | + | |
14 | 16 | | |
15 | 17 | | |
16 | 18 | | |
17 | 19 | | |
| 20 | + | |
| 21 | + | |
18 | 22 | | |
19 | 23 | | |
20 | 24 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| 15 | + | |
| 16 | + | |
15 | 17 | | |
16 | 18 | | |
17 | 19 | | |
18 | 20 | | |
19 | 21 | | |
20 | 22 | | |
21 | 23 | | |
| 24 | + | |
| 25 | + | |
22 | 26 | | |
23 | 27 | | |
24 | 28 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| 15 | + | |
| 16 | + | |
15 | 17 | | |
16 | 18 | | |
17 | 19 | | |
18 | 20 | | |
19 | 21 | | |
20 | 22 | | |
21 | 23 | | |
| 24 | + | |
| 25 | + | |
22 | 26 | | |
23 | 27 | | |
24 | 28 | | |
| |||
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
24 | | - | |
| 23 | + | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
Lines changed: 0 additions & 10 deletions
This file was deleted.
0 commit comments