Skip to content

Commit

Permalink
Clean up conflicts for sylius/sylius
Browse files Browse the repository at this point in the history
  • Loading branch information
@jakubtobiasz
jakubtobiasz committed Apr 21, 2023
1 parent daa6dbd commit 6918fd8
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 80 deletions.
30 changes: 0 additions & 30 deletions CONFLICTS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,6 @@
This document explains why certain conflicts were added to `composer.json` and
references related issues.

- `doctrine/doctrine-bundle:2.3.0`:

This version makes Gedmo Doctrine Extensions fail (tree and position behaviour mostly).

References: https://github.com/doctrine/DoctrineBundle/issues/1305

- `jms/serializer-bundle:4.1.0`:

This version contains service with a wrong constructor arguments:
`Invalid definition for service ".container.private.profiler": argument 4 of "JMS\SerializerBundle\Debug\DataCollector::__construct()" accepts "JMS\SerializerBundle\Debug\TraceableDriver", "JMS\SerializerBundle\Debug\TraceableMetadataFactory" passed.`

References: https://github.com/schmittjoh/JMSSerializerBundle/issues/902

- `symfony/dependency-injection:5.4.5`:

This version is causing a problem with mink session:
`InvalidArgumentException: Specify session name to get in vendor/friends-of-behat/mink/src/Mink.php:198`,
Psalm error:
`UndefinedDocblockClass: Docblock-defined class, interface or enum named UnitEnum does not exist`.

- `symfony/framework-bundle:5.4.5`:

This version is causing a problem with returning null as token from `Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage`
which leads to wrong solving path prefix by `Sylius\Bundle\ApiBundle\Provider\PathPrefixProvider` in API scenarios

- `doctrine/migrations:3.5.3`:

This version is causing a problem with migrations and results in throwing a `Doctrine\Migrations\Exception\MetadataStorageError` exception e.g. when executing `sylius:install` command.
References: https://github.com/doctrine/migrations/issues/1302

- `lexik/jwt-authentication-bundle: ^2.18`

After bumping to this version ApiBundle starts failing due to requesting a non-existing `api_platform.openapi.factory.legacy` service.
Expand Down
95 changes: 45 additions & 50 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
"doctrine/collections": "^1.6",
"doctrine/common": "^3.2",
"doctrine/dbal": "^2.7 || ^3.0",
"doctrine/doctrine-bundle": "^1.12 || ^2.0",
"doctrine/doctrine-bundle": "^1.12 || ^2.9.1",
"doctrine/doctrine-migrations-bundle": "^3.0.1",
"doctrine/event-manager": "^1.1",
"doctrine/inflector": "^1.4 || ^2.0",
"doctrine/migrations": "^3.0",
"doctrine/migrations": "^3.5.5",
"doctrine/orm": "^2.13",
"doctrine/persistence": "^2.3",
"egulias/email-validator": "^3.1",
Expand All @@ -50,15 +50,15 @@
"gedmo/doctrine-extensions": "^3.2",
"guzzlehttp/guzzle": "^6.5",
"guzzlehttp/psr7": "^1.8",
"jms/serializer-bundle": "^4.0",
"jms/serializer-bundle": "^4.2.0",
"knplabs/gaufrette": "^0.10 || ^0.11",
"knplabs/knp-gaufrette-bundle": "^0.7 || ^0.8",
"knplabs/knp-menu": "^3.1",
"knplabs/knp-menu-bundle": "^3.0",
"laminas/laminas-stdlib": "^3.3.1",
"league/flysystem-bundle": "^2.4",
"lexik/jwt-authentication-bundle": "^2.11",
"liip/imagine-bundle": "^2.3",
"liip/imagine-bundle": "^2.10",
"pagerfanta/pagerfanta": "^3.0",
"payum/payum": "^1.7.2",
"payum/payum-bundle": "^2.5",
Expand All @@ -84,49 +84,49 @@
"sylius/resource": "^1.9",
"sylius/resource-bundle": "^1.9",
"sylius/theme-bundle": "^2.1.1 || ^2.3",
"symfony/asset": "^5.4 || ^6.0",
"symfony/config": "^5.4 || ^6.0",
"symfony/console": "^5.4 || ^6.0",
"symfony/dependency-injection": "^5.4 || ^6.0",
"symfony/asset": "^5.4.21 || ^6.0",
"symfony/config": "^5.4.21 || ^6.0",
"symfony/console": "^5.4.21 || ^6.0",
"symfony/dependency-injection": "^5.4.21 || ^6.0",
"symfony/deprecation-contracts": "^2.5",
"symfony/doctrine-bridge": "^5.4 || ^6.0",
"symfony/doctrine-messenger": "^5.4 || ^6.0",
"symfony/event-dispatcher": "^5.4 || ^6.0",
"symfony/expression-language": "^5.4 || ^6.0",
"symfony/filesystem": "^5.4 || ^6.0",
"symfony/finder": "^5.4 || ^6.0",
"symfony/form": "^5.4 || ^6.0",
"symfony/framework-bundle": "^5.4 || ^6.0",
"symfony/http-foundation": "^5.4 || ^6.0",
"symfony/http-kernel": "^5.4 || ^6.0",
"symfony/intl": "^5.4 || ^6.0",
"symfony/mailer": "^5.4 || ^6.0",
"symfony/messenger": "^5.4 || ^6.0",
"symfony/doctrine-bridge": "^5.4.21 || ^6.0",
"symfony/doctrine-messenger": "^5.4.21 || ^6.0",
"symfony/event-dispatcher": "^5.4.21 || ^6.0",
"symfony/expression-language": "^5.4.21 || ^6.0",
"symfony/filesystem": "^5.4.21 || ^6.0",
"symfony/finder": "^5.4.21 || ^6.0",
"symfony/form": "^5.4.21 || ^6.0",
"symfony/framework-bundle": "^5.4.21 || ^6.0",
"symfony/http-foundation": "^5.4.21 || ^6.0",
"symfony/http-kernel": "^5.4.21 || ^6.0",
"symfony/intl": "^5.4.21 || ^6.0",
"symfony/mailer": "^5.4.21 || ^6.0",
"symfony/messenger": "^5.4.21 || ^6.0",
"symfony/monolog-bundle": "^3.5",
"symfony/options-resolver": "^5.4 || ^6.0",
"symfony/password-hasher": "^5.4 || ^6.0",
"symfony/options-resolver": "^5.4.21 || ^6.0",
"symfony/password-hasher": "^5.4.21 || ^6.0",
"symfony/polyfill-iconv": "^1.17",
"symfony/polyfill-intl-icu": "^1.22",
"symfony/polyfill-mbstring": "^1.17",
"symfony/polyfill-php80": "^1.17",
"symfony/process": "^5.4 || ^6.0",
"symfony/property-access": "^5.4 || ^6.0",
"symfony/property-info": "^5.4 || ^6.0",
"symfony/proxy-manager-bridge": "^5.4 || ^6.0",
"symfony/routing": "^5.4 || ^6.0",
"symfony/security-bundle": "^5.4 || ^6.0",
"symfony/security-core": "^5.4 || ^6.0",
"symfony/security-csrf": "^5.4 || ^6.0",
"symfony/security-http": "^5.4 || ^6.0",
"symfony/serializer": "^5.4 || ^6.0",
"symfony/string": "^5.4 || ^6.0",
"symfony/templating": "^5.4 || ^6.0",
"symfony/translation": "^5.4 || ^6.0",
"symfony/process": "^5.4.21 || ^6.0",
"symfony/property-access": "^5.4.21 || ^6.0",
"symfony/property-info": "^5.4.21 || ^6.0",
"symfony/proxy-manager-bridge": "^5.4.21 || ^6.0",
"symfony/routing": "^5.4.21 || ^6.0",
"symfony/security-bundle": "^5.4.21 || ^6.0",
"symfony/security-core": "^5.4.21 || ^6.0",
"symfony/security-csrf": "^5.4.21 || ^6.0",
"symfony/security-http": "^5.4.21 || ^6.0",
"symfony/serializer": "^5.4.21 || ^6.0",
"symfony/string": "^5.4.21 || ^6.0",
"symfony/templating": "^5.4.21 || ^6.0",
"symfony/translation": "^5.4.21 || ^6.0",
"symfony/translation-contracts": "^2.5",
"symfony/twig-bundle": "^5.4 || ^6.0",
"symfony/validator": "^5.4 || ^6.0",
"symfony/twig-bundle": "^5.4.21 || ^6.0",
"symfony/validator": "^5.4.21 || ^6.0",
"symfony/webpack-encore-bundle": "^1.15",
"symfony/yaml": "^5.4 || ^6.0",
"symfony/yaml": "^5.4.21 || ^6.0",
"twig/intl-extra": "^2.12 || ^3.4",
"twig/twig": "^2.12 || ^3.3",
"webmozart/assert": "^1.9",
Expand Down Expand Up @@ -178,13 +178,8 @@
"sylius/user-bundle": "self.version"
},
"conflict": {
"doctrine/doctrine-bundle": "2.3.0",
"doctrine/migrations": "3.5.3",
"jms/serializer-bundle": "4.1.0",
"lexik/jwt-authentication-bundle": "^2.18",
"symfony/framework-bundle": "5.4.5 || 6.2.8",
"symfony/dependency-injection": "5.4.5",
"liip/imagine-bundle": "2.7.0"
"symfony/framework-bundle": "6.2.8"
},
"require-dev": {
"behat/behat": "^3.6.1",
Expand Down Expand Up @@ -222,12 +217,12 @@
"rector/rector": "^0.15.13",
"stripe/stripe-php": "^10.4",
"sylius-labs/coding-standard": "^4.2",
"symfony/browser-kit": "^5.4 || ^6.0",
"symfony/debug-bundle": "^5.4 || ^6.0",
"symfony/dotenv": "^5.4 || ^6.0",
"symfony/browser-kit": "^5.4.21 || ^6.0",
"symfony/debug-bundle": "^5.4.21 || ^6.0",
"symfony/dotenv": "^5.4.21 || ^6.0",
"symfony/flex": "^2.2",
"symfony/runtime": "^5.4 || ^6.0",
"symfony/web-profiler-bundle": "^5.4 || ^6.0",
"symfony/runtime": "^5.4.21 || ^6.0",
"symfony/web-profiler-bundle": "^5.4.21 || ^6.0",
"symplify/monorepo-builder": "^11.0",
"vimeo/psalm": "^4.19"
},
Expand Down

0 comments on commit 6918fd8

Please sign in to comment.