Commit 49be6b8
committed
Merge branch '5.4' into 6.4
* 5.4:
Work around parse_url() bug (bis)
fix PHP 7.2 compatibility
silence PHP warnings issued by Redis::connect()
Bump Symfony version to 5.4.48
Update VERSION for 5.4.47
Update CHANGELOG for 5.4.47
[Routing] Fix: lost priority when defining hosts in configuration
fix dumping tests to skip with data providers2 files changed
+6
-9
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
351 | 351 | | |
352 | 352 | | |
353 | 353 | | |
354 | | - | |
355 | | - | |
356 | | - | |
357 | | - | |
358 | | - | |
359 | | - | |
360 | | - | |
| 354 | + | |
361 | 355 | | |
362 | 356 | | |
363 | 357 | | |
| |||
380 | 374 | | |
381 | 375 | | |
382 | 376 | | |
383 | | - | |
| 377 | + | |
384 | 378 | | |
385 | 379 | | |
| 380 | + | |
| 381 | + | |
386 | 382 | | |
387 | 383 | | |
388 | 384 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
326 | 326 | | |
327 | 327 | | |
328 | 328 | | |
329 | | - | |
| 329 | + | |
| 330 | + | |
330 | 331 | | |
331 | 332 | | |
332 | 333 | | |
| |||
0 commit comments