Commit b5f3aa6
committed
Merge branch '7.4' into 8.0
* 7.4:
Fix merge
[FrameworkBundle] Clean `http_cache` dir in `KernelTestCase::ensureKernelShutdown()`
fix tests on Windows
[PropertyInfo] Conflict with phpdocumentor/reflection-docblock >= 6
[Finder] Fix appending empty iterators
Fix attributeLoader
Bump Symfony version to 7.4.5
Update VERSION for 7.4.4
Update CHANGELOG for 7.4.4
Bump Symfony version to 7.3.11
Update VERSION for 7.3.10
Update CHANGELOG for 7.3.10
Bump Symfony version to 6.4.33
Update VERSION for 6.4.32
Update CONTRIBUTORS for 6.4.32
Update CHANGELOG for 6.4.32
[Process] Fix escaping for MSYS on Windows2 files changed
+21
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1647 | 1647 | | |
1648 | 1648 | | |
1649 | 1649 | | |
1650 | | - | |
| 1650 | + | |
1651 | 1651 | | |
1652 | 1652 | | |
1653 | 1653 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1513 | 1513 | | |
1514 | 1514 | | |
1515 | 1515 | | |
| 1516 | + | |
| 1517 | + | |
| 1518 | + | |
| 1519 | + | |
| 1520 | + | |
| 1521 | + | |
| 1522 | + | |
| 1523 | + | |
| 1524 | + | |
| 1525 | + | |
| 1526 | + | |
| 1527 | + | |
| 1528 | + | |
| 1529 | + | |
| 1530 | + | |
| 1531 | + | |
| 1532 | + | |
| 1533 | + | |
| 1534 | + | |
| 1535 | + | |
1516 | 1536 | | |
1517 | 1537 | | |
1518 | 1538 | | |
| |||
0 commit comments