Skip to content

Commit

Permalink
Merge 3.x into 4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI committed Mar 23, 2023
2 parents 09aacdf + 61bb344 commit 43dea04
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"phpstan/phpstan-symfony": "^1.0",
"phpunit/phpunit": "^9.5",
"psalm/plugin-phpunit": "^0.18",
"psalm/plugin-symfony": "^4.0 || ^5.0",
"psalm/plugin-symfony": "^5.0",
"rector/rector": "^0.15",
"symfony/config": "^5.4 || ^6.2",
"symfony/dependency-injection": "^5.4 || ^6.2",
Expand All @@ -48,7 +48,7 @@
"symfony/phpunit-bridge": "^6.2",
"symfony/property-access": "^5.4 || ^6.2",
"symfony/routing": "^5.4 || ^6.2",
"vimeo/psalm": "^4.9.2 || ^5.0"
"vimeo/psalm": "^5.0"
},
"conflict": {
"doctrine/mongodb-odm": "<2.3",
Expand Down

0 comments on commit 43dea04

Please sign in to comment.