Skip to content

Commit 8ac40ce

Browse files
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 functionality
2 parents 6ed3d6a + b28d294 commit 8ac40ce

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,14 @@
2828
"symfony/process": "~3.4|~4.0",
2929
"psr/log": "~1.0"
3030
},
31+
"provide": {
32+
"psr/log-implementation": "1.0"
33+
},
3134
"suggest": {
3235
"symfony/event-dispatcher": "",
3336
"symfony/lock": "",
3437
"symfony/process": "",
35-
"psr/log-implementation": "For using the console logger"
38+
"psr/log": "For using the console logger"
3639
},
3740
"conflict": {
3841
"symfony/dependency-injection": "<3.4",

0 commit comments

Comments
 (0)