Commit cb97c0e
committed
Merge branch '6.4' into 7.0
* 6.4:
fix merge
fix syntax for PHP 7.2
[Security] Fix Danish translations
[Messenger] Improve deadlock handling on `ack()` and `reject()`
[DomCrawler] Encode html entities only if nessecary
[Serializer] reset backed_enum priority, and re-prioritise translatable
[Validator] Accept `Stringable` in `ExecutionContext::build/addViolation()`
[Serializer] Ignore when using #[Ignore] on a non-accessor
[Filesystem] Strengthen the check of file permissions in `dumpFile`
[Serializer] Fix XML scalar to object denormalization
[HttpClient][EventSourceHttpClient] Fix consuming SSEs with \r\n separatorFile tree
2 files changed
+18
-3
lines changed- Resources/config
- Tests/DependencyInjection
2 files changed
+18
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
115 | 115 | | |
116 | 116 | | |
117 | 117 | | |
118 | | - | |
| 118 | + | |
119 | 119 | | |
120 | 120 | | |
121 | 121 | | |
| |||
212 | 212 | | |
213 | 213 | | |
214 | 214 | | |
215 | | - | |
| 215 | + | |
216 | 216 | | |
217 | 217 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
| 69 | + | |
69 | 70 | | |
70 | 71 | | |
71 | 72 | | |
| |||
1539 | 1540 | | |
1540 | 1541 | | |
1541 | 1542 | | |
1542 | | - | |
| 1543 | + | |
1543 | 1544 | | |
1544 | 1545 | | |
1545 | 1546 | | |
| 1547 | + | |
| 1548 | + | |
| 1549 | + | |
| 1550 | + | |
| 1551 | + | |
| 1552 | + | |
| 1553 | + | |
| 1554 | + | |
| 1555 | + | |
| 1556 | + | |
| 1557 | + | |
| 1558 | + | |
| 1559 | + | |
| 1560 | + | |
1546 | 1561 | | |
1547 | 1562 | | |
1548 | 1563 | | |
| |||
0 commit comments