Commit 5efbaf1
committed
Merge branch '6.4' into 7.0
* 6.4:
[Serializer] Remove TranslatableNormalizer service when the Translator is disabled
Fix support to denormalize plain object types
[Routing] Restore aliases removal in RouteCollection::remove()
[Workflow] Add `getEnabledTransition()` to TraceableWorkflow
[DependencyInjection] Fix parsing named autowiring aliases that contain underscores
[Console] Add Les-Tilleuls.coop as sponsor of version 6.4/7.0
remove duplicated service definitionFile tree
5 files changed
+46
-1
lines changed- DependencyInjection
- Tests/DependencyInjection
- Fixtures
- php
- xml
- yml
5 files changed
+46
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1857 | 1857 | | |
1858 | 1858 | | |
1859 | 1859 | | |
1860 | | - | |
| 1860 | + | |
1861 | 1861 | | |
1862 | 1862 | | |
1863 | 1863 | | |
| |||
Lines changed: 14 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
Lines changed: 15 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
Lines changed: 10 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1434 | 1434 | | |
1435 | 1435 | | |
1436 | 1436 | | |
| 1437 | + | |
| 1438 | + | |
| 1439 | + | |
| 1440 | + | |
| 1441 | + | |
| 1442 | + | |
1437 | 1443 | | |
1438 | 1444 | | |
1439 | 1445 | | |
| |||
0 commit comments