Commit 72ac3b3
committed
Merge branch '4.1' into 4.2
* 4.1:
bump required Twig version
fix compatibility with Twig >= 2.6.1
[Form] SA fix
fix compatibility with PHPUnit 4.8
remove return type hint for PHP 5 compatibility
SCA: minor code tweaks
Component CssSelector tests
[DebugClassLoader] Readd findFile() method
[Console] Fix composer.json suggest/provide
Revert "bug #29597 [DI] fix reporting bindings on overriden services as unused (nicolas-grekas)"
Fixed exception wording
Fix SwiftMailerHandler to support Monolog's latest reset functionality1 file changed
+2
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
| 49 | + | |
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| |||
0 commit comments