Skip to content

Commit

Permalink
bug Sylius#13730 [Maintenance] Add conflict to symfony/framework-bund…
Browse files Browse the repository at this point in the history
…le to fix problem with solving path prefix in API scenarios (GSadee)

This PR was merged into the 1.9 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.9
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | 
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.10 or 1.11 branch(the lowest possible)
 - Features and deprecations must be submitted against the master 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
-->


Commits
-------

26a6c74 [Maintenance] Add conflict to symfony/framework-bundle to fix problem with solving path prefix in API scenarios
  • Loading branch information
lchrusciel authored Mar 7, 2022
2 parents 644386f + 26a6c74 commit 9460236
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
5 changes: 5 additions & 0 deletions CONFLICTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ references related issues.
`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:^4.4.38|^5.4.5`:

These versions are 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/orm:2.10.0`:

Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@
"jms/serializer-bundle": "3.9.0",
"symfony/dependency-injection": "4.4.38 || 5.4.5",
"symfony/doctrine-bridge": "4.4.16",
"symfony/framework-bundle": "^4.4.38 || ^5.4.5",
"symfony/polyfill-mbstring": "^1.22.0",
"symfony/property-info": "4.4.22 || 5.2.7",
"symfony/serializer": "4.4.19 || 5.2.2",
Expand Down

0 comments on commit 9460236

Please sign in to comment.