Commit 153540b
committed
Merge branch '6.1' into 6.2
* 6.1:
[Messenger] cs fix
[Messenger] Fix time-limit check exception
[Console] Fix console `ProgressBar::override()` after manual `ProgressBar::cleanup()`
[FrameworkBundle] typo default_lifetime example
[HttpClient] Handle Amp HTTP client v5 incompatibility gracefully
[HttpKernel] Don’t try to wire Response argument with controller.service_arguments
[PhpUnitBridge] Fix language deprecations incorrectly marked as direct
[FrameworkBundle] Removed unused $willBeAvailable params on Configuration
[Cache] Remove extra type condition in MemcachedAdapter::createConnection()
Tell about messenger:consume invalid limit options
[Messenger] Do not throw 'no handlers' exception when skipping due to duplicate handling2 files changed
+9
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| 20 | + | |
20 | 21 | | |
21 | 22 | | |
22 | 23 | | |
| |||
29 | 30 | | |
30 | 31 | | |
31 | 32 | | |
32 | | - | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
33 | 38 | | |
34 | 39 | | |
35 | 40 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| 15 | + | |
15 | 16 | | |
16 | 17 | | |
17 | 18 | | |
| |||
30 | 31 | | |
31 | 32 | | |
32 | 33 | | |
33 | | - | |
| 34 | + | |
34 | 35 | | |
35 | 36 | | |
36 | 37 | | |
| |||
61 | 62 | | |
62 | 63 | | |
63 | 64 | | |
64 | | - | |
| 65 | + | |
65 | 66 | | |
66 | 67 | | |
67 | 68 | | |
| |||
0 commit comments