Commit 97ae972
committed
Merge branch '5.4' into 6.2
* 5.4:
[FrameworkBundle] Fix Workflow without a marking store definition uses marking store definition of previously defined workflow
[HttpFoundation] UrlHelper is now aware of RequestContext changes
UrlHelper is now aware of RequestContext changes
[Process] Stop the process correctly even if underlying input stream is not closed:
[Notifier] Update AmazonSns url in doc from de to en
[PropertyInfo] Fix `PhpStanExtractor` when constructor has no docblock2 files changed
+11
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
421 | 421 | | |
422 | 422 | | |
423 | 423 | | |
424 | | - | |
| 424 | + | |
425 | 425 | | |
426 | 426 | | |
427 | 427 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1536 | 1536 | | |
1537 | 1537 | | |
1538 | 1538 | | |
| 1539 | + | |
| 1540 | + | |
| 1541 | + | |
| 1542 | + | |
| 1543 | + | |
| 1544 | + | |
| 1545 | + | |
| 1546 | + | |
| 1547 | + | |
| 1548 | + | |
1539 | 1549 | | |
1540 | 1550 | | |
1541 | 1551 | | |
| |||
0 commit comments