Skip to content

Commit 4e0f8d9

Browse files
Merge branch '3.4' into 4.3
* 3.4: Use PHP 7.4 on deps=low
2 parents be74d6b + f44a63a commit 4e0f8d9

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,12 @@
3535
"symfony/property-access": "~3.4|~4.0",
3636
"symfony/property-info": "~3.4|~4.0",
3737
"symfony/translation": "~4.2",
38-
"doctrine/annotations": "~1.0",
38+
"doctrine/annotations": "~1.7",
3939
"doctrine/cache": "~1.0",
40-
"egulias/email-validator": "^1.2.8|~2.0"
40+
"egulias/email-validator": "^2.1.10"
4141
},
4242
"conflict": {
43+
"doctrine/lexer": "<1.0.2",
4344
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
4445
"symfony/dependency-injection": "<3.4",
4546
"symfony/http-kernel": "<3.4",

0 commit comments

Comments
 (0)