Skip to content

Commit

Permalink
Move conflicts to composer requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
LucaGallinari authored and lruozzi9 committed Jul 19, 2022
1 parent 455f2b9 commit 0db14f1
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,17 @@
"phpstan/phpstan-strict-rules": "^0.12.0",
"phpstan/phpstan-webmozart-assert": "0.12.12",
"phpunit/phpunit": "^9.5",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
"sensiolabs/security-checker": "^6.0",
"sylius-labs/coding-standard": "^4.0",
"sylius-labs/coding-standard": "<=4.2.0",
"symfony/browser-kit": "^4.4 || ^5.2",
"symfony/debug-bundle": "^4.4 || ^5.2",
"symfony/dotenv": "^4.4 || ^5.2",
"symfony/intl": "^4.4 || ^5.2",
"symfony/web-profiler-bundle": "^4.4 || ^5.2",
"symplify/easy-coding-standard": "^9.0",
"theofidry/alice-data-fixtures": "^1.1",
"vimeo/psalm": "4.23.0",
"polishsymfonycommunity/symfony-mocker-container": "^1.0"
"vimeo/psalm": "4.23.0"
},
"config": {
"sort-packages": true,
Expand All @@ -59,10 +60,6 @@
"symfony/thanks": true
}
},
"conflict": {
"sylius-labs/coding-standard": ">=4.2.1",
"symplify/easy-coding-standard": "^10"
},
"extra": {
"branch-alias": {
"dev-master": "1.10-dev"
Expand Down

0 comments on commit 0db14f1

Please sign in to comment.