Skip to content

Commit aa675d8

Browse files
Merge branch '4.3' into 4.4
* 4.3: Do not extend the new SF 4.3 ControllerEvent so we can make it final Backported return type violation bugfixes. [FrameworkBundle] Fix BrowserKit assertions to make them compatible with Panther
2 parents 6eb054d + a371686 commit aa675d8

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
"egulias/email-validator": "^2.0",
2525
"symfony/dependency-injection": "^3.4|^4.1|^5.0"
2626
},
27+
"conflict": {
28+
"symfony/mailer": "<4.4"
29+
},
2730
"autoload": {
2831
"psr-4": { "Symfony\\Component\\Mime\\": "" },
2932
"exclude-from-classmap": [

0 commit comments

Comments
 (0)