kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 09:02:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch '2.0' into 2.0-docs

Browse source 
* 2.0:
  Fix application's version v1.14.1-DEV
  [Composer] Add conflict to phpstan/phpdoc-parser >= 2.0
This commit is contained in:
Grzegorz Sadowski 2024-11-12 17:40:07 +01:00
commit 89661f7416
No known key found for this signature in database
GPG key ID: EF87FF4E6E3BD364
6 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Sylius/Bundle/AddressingBundle/composer.json
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",

3
src/Sylius/Bundle/AttributeBundle/composer.json
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": {

2
src/Sylius/Bundle/CoreBundle/SyliusCoreBundle.php
View file

@ -48,7 +48,7 @@ final class SyliusCoreBundle extends AbstractResourceBundle
public const MINOR_VERSION = '0'; public const MINOR_VERSION = '0';
public const RELEASE_VERSION = '1'; public const RELEASE_VERSION = '0';
public const EXTRA_VERSION = 'DEV'; public const EXTRA_VERSION = 'DEV';

3
src/Sylius/Bundle/CoreBundle/composer.json
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",

3
src/Sylius/Bundle/InventoryBundle/composer.json
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",

3
src/Sylius/Bundle/PromotionBundle/composer.json
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",