Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Composer] Add conflicts to fix build for Symfony 3.4 #11097

Merged
merged 1 commit into from
Feb 6, 2020

Conversation

GSadee
Copy link
Member

@GSadee GSadee commented Feb 5, 2020

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

@GSadee GSadee added Potential Bug Potential bugs or bugfixes, that needs to be reproduced. Maintenance CI configurations, READMEs, releases, etc. labels Feb 5, 2020
@GSadee GSadee requested a review from a team as a code owner February 5, 2020 20:37
@GSadee GSadee changed the base branch from master to 1.6 February 5, 2020 20:37
"symfony/symfony": "3.4.7",
"symfony/doctrine-bridge": "3.4.37",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it related to Psalm failures?

@pamil pamil merged commit f92e8d9 into Sylius:1.6 Feb 6, 2020
@pamil
Copy link
Contributor

pamil commented Feb 6, 2020

Thank you, Grzegorz! 🥇

pamil added a commit that referenced this pull request Feb 6, 2020
This PR was merged into the 1.6 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.6
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | fixes #10912, based on #11064 and #11097
| License         | MIT


Commits
-------

eab2397 fix code generation with too long code length
ef1dcb8 [Promotion] Return PHP_INT_MAX value as possible generation amount of coupons when the code length is too large
@GSadee GSadee deleted the fix-build branch February 6, 2020 08:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Maintenance CI configurations, READMEs, releases, etc. Potential Bug Potential bugs or bugfixes, that needs to be reproduced.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants