mirror of
https://github.com/Sylius/Sylius.git
synced 2026-07-14 17:10:53 +00:00
[Composer] Add conflict to phpstan/phpdoc-parser >= 2.0 (#17464)
| Q | A |-----------------|----- | Branch? | 2.0 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Related tickets | | License | MIT <!-- - Bug fixes must be submitted against the 1.13 branch - Features and deprecations must be submitted against the 1.14 branch - Features, removing deprecations and BC breaks must be submitted against the 2.0 branch - Make sure that the correct base branch is set To be sure you are not breaking any Backward Compatibilities, check the documentation: https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html -->
This commit is contained in:
commit
a1ef4d4adb
5 changed files with 11 additions and 4 deletions
|
|
@ -34,7 +34,8 @@
|
||||||
"symfony/intl": "^6.4 || ^7.1"
|
"symfony/intl": "^6.4 || ^7.1"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"doctrine/orm": ">= 3.0"
|
"doctrine/orm": ">= 3.0",
|
||||||
|
"phpstan/phpdoc-parser": ">= 2.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"doctrine/data-fixtures": "^1.7",
|
"doctrine/data-fixtures": "^1.7",
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,8 @@
|
||||||
"symfony/form": "^6.4.1 || ^7.1"
|
"symfony/form": "^6.4.1 || ^7.1"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"doctrine/orm": ">= 3.0"
|
"doctrine/orm": ">= 3.0",
|
||||||
|
"phpstan/phpdoc-parser": ">= 2.0"
|
||||||
},
|
},
|
||||||
"config": {
|
"config": {
|
||||||
"allow-plugins": {
|
"allow-plugins": {
|
||||||
|
|
|
||||||
|
|
@ -68,6 +68,9 @@
|
||||||
"symfony/workflow": "^6.4 || ^7.1",
|
"symfony/workflow": "^6.4 || ^7.1",
|
||||||
"php-http/discovery": "^1.20"
|
"php-http/discovery": "^1.20"
|
||||||
},
|
},
|
||||||
|
"conflict": {
|
||||||
|
"phpstan/phpdoc-parser": ">= 2.0"
|
||||||
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"doctrine/doctrine-bundle": "^2.13",
|
"doctrine/doctrine-bundle": "^2.13",
|
||||||
"hwi/oauth-bundle": "^2.2",
|
"hwi/oauth-bundle": "^2.2",
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,8 @@
|
||||||
"symfony/validator": "^6.4 || ^7.1"
|
"symfony/validator": "^6.4 || ^7.1"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"doctrine/orm": ">= 3.0"
|
"doctrine/orm": ">= 3.0",
|
||||||
|
"phpstan/phpdoc-parser": ">= 2.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"doctrine/doctrine-bundle": "^2.13",
|
"doctrine/doctrine-bundle": "^2.13",
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,8 @@
|
||||||
"symfony/framework-bundle": "^6.4.1 || ^7.1"
|
"symfony/framework-bundle": "^6.4.1 || ^7.1"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"doctrine/orm": ">= 3.0"
|
"doctrine/orm": ">= 3.0",
|
||||||
|
"phpstan/phpdoc-parser": ">= 2.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"doctrine/doctrine-bundle": "^2.13",
|
"doctrine/doctrine-bundle": "^2.13",
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue