Commit 7113bea
committed
Merge branch '5.4' into 6.0
* 5.4:
Fix incompatible implicit float-to-int conversions
[Translation] Don't pass null to strtoupper()
cs fix
[String] Fix implicit float-to-int casts
[Asset] Don't pass null to strpos()
[Messenger] Fix broken mock
[DependencyInjection] Don't pass null to trim()
Add return types to JsonSerializable implementations
Fix Serializable deprecations triggered by token mocks
Add missing security translations
[FrameworkBundle] Deprecate the public `profiler` service to private1 file changed
+4
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
476 | 476 | | |
477 | 477 | | |
478 | 478 | | |
479 | | - | |
| 479 | + | |
480 | 480 | | |
481 | 481 | | |
482 | | - | |
| 482 | + | |
483 | 483 | | |
484 | 484 | | |
485 | 485 | | |
486 | 486 | | |
487 | 487 | | |
488 | 488 | | |
489 | | - | |
| 489 | + | |
490 | 490 | | |
491 | 491 | | |
492 | 492 | | |
493 | 493 | | |
494 | | - | |
| 494 | + | |
495 | 495 | | |
496 | 496 | | |
497 | 497 | | |
| |||
0 commit comments