Skip to content

Commit f61b964

Browse files
Merge branch '5.2' into 5.x
* 5.2: µCS fix CS fix CS fix [travis] use PHP 8.0 to patch return types and run deps=low Add me as a Notifier code owner Update sl_SI translations Don't trigger deprecation for deprecated aliases pointing to deprecated definitions [HttpFoundation] use atomic writes in MockFileSessionStorage fix typo Make EmailMessage & SmsMessage transport nullable remove unused argument [SecurityBundle] Drop dead check [DI] fix param annotation [SecurityBundle] Remove invalid service definition [Config] Add \Symfony\Component\Config\Loader::load() return type Simplify PHP CS Fixer config Rename normalize param
2 parents b2255f0 + 92938fb commit f61b964

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"symfony/routing": "^5.2"
3434
},
3535
"require-dev": {
36-
"doctrine/annotations": "~1.7",
36+
"doctrine/annotations": "^1.10.4",
3737
"doctrine/cache": "~1.0",
3838
"symfony/asset": "^5.3",
3939
"symfony/browser-kit": "^4.4|^5.0",
@@ -69,8 +69,8 @@
6969
},
7070
"conflict": {
7171
"doctrine/persistence": "<1.3",
72-
"phpdocumentor/reflection-docblock": "<3.0",
73-
"phpdocumentor/type-resolver": "<0.2.1",
72+
"phpdocumentor/reflection-docblock": "<3.2.2",
73+
"phpdocumentor/type-resolver": "<1.4.0",
7474
"phpunit/phpunit": "<5.4.3",
7575
"symfony/asset": "<5.3",
7676
"symfony/browser-kit": "<4.4",

0 commit comments

Comments
 (0)