Skip to content

Commit 79c17bd

Browse files
Merge branch '4.4' into 5.1
* 4.4: CS fix [travis] use PHP 8.0 to patch return types and run deps=low Update sl_SI translations Don't trigger deprecation for deprecated aliases pointing to deprecated definitions [HttpFoundation] use atomic writes in MockFileSessionStorage [DI] fix param annotation [Config] Add \Symfony\Component\Config\Loader::load() return type Simplify PHP CS Fixer config Rename normalize param
2 parents b04d62d + 2675741 commit 79c17bd

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
"symfony/polyfill-php80": "^1.15",
3131
"symfony/filesystem": "^4.4|^5.0",
3232
"symfony/finder": "^4.4|^5.0",
33-
"symfony/routing": "^5.1"
33+
"symfony/routing": "^5.1.4"
3434
},
3535
"require-dev": {
36-
"doctrine/annotations": "~1.7",
36+
"doctrine/annotations": "^1.10.4",
3737
"doctrine/cache": "~1.0",
3838
"symfony/asset": "^5.1",
3939
"symfony/browser-kit": "^4.4|^5.0",
@@ -63,14 +63,14 @@
6363
"symfony/yaml": "^4.4|^5.0",
6464
"symfony/property-info": "^4.4|^5.0",
6565
"symfony/web-link": "^4.4|^5.0",
66-
"phpdocumentor/reflection-docblock": "^3.0|^4.0",
66+
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
6767
"paragonie/sodium_compat": "^1.8",
6868
"twig/twig": "^2.10|^3.0"
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.1",
7676
"symfony/browser-kit": "<4.4",

0 commit comments

Comments
 (0)