[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:
Michał Pysiak 2024-11-12 17:37:28 +01:00 committed by GitHub
commit a1ef4d4adb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 11 additions and 4 deletions

View file

@ -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",

View file

@ -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": {

View file

@ -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",

View file

@ -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",

View file

@ -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",