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.

Sign up for GitHub

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

Jump to bottom

[HotFix] Update conflict to doctrine/orm to fix the problem with creating taxons #13173

Merged
merged 1 commit into from Oct 6, 2021
Merged

[HotFix] Update conflict to doctrine/orm to fix the problem with creating taxons #13173

merged 1 commit into from Oct 6, 2021

Conversation

GSadee
Copy link
Member

@GSadee GSadee commented Oct 6, 2021

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

@GSadee GSadee added Maintenance CI configurations, READMEs, releases, etc. Bug Confirmed bugs or bugfixes. labels Oct 6, 2021
@GSadee GSadee requested a review from a team as a code owner October 6, 2021 05:15
@GSadee GSadee mentioned this pull request Oct 6, 2021
Merged
@Zales0123 Zales0123 merged commit 6fc113a into Sylius:1.9 Oct 6, 2021
@Zales0123
Copy link
Member

Thank you, Grzegorz! 🎉

@GSadee GSadee deleted the hot-fix-doctrine-orm branch October 6, 2021 09:44
Zales0123 added a commit that referenced this pull request Oct 6, 2021
@Zales0123
refactor #13174 [CatalogPromotion] Refactor scope validators to be mo…
61dee95 
…re extendable (GSadee)

This PR was merged into the 1.11-dev branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | master
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | 
| Related tickets | based on #13173
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.9 or 1.10 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
-------

c797d49 [CatalogPromotion] Refactor scope validators to be more extendable
9efc29a [CatalogPromotion] Refactor main scope validator to dehardcode types
b6efb9a [CatalogPromotion] Refactor scope validators to do an actual validation
@mbabker
Copy link
Contributor

mbabker commented Nov 17, 2021

This needs to be reverted. A new version of Doctrine Extensions fixing the ORM 2.10 conflict (after the ORM reverted one of the big changes that caused the conflict in the first place) is available. As of now, Sylius users are locked to ORM 2.9.6 and Doctrine Extensions 3.2 at best and cannot upgrade to ORM 2.10 nor Doctrine Extensions 3.3.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Arminek Arminek Arminek approved these changes

@arti0090 arti0090 arti0090 approved these changes

Assignees
No one assigned
Labels
Bug Confirmed bugs or bugfixes. Maintenance CI configurations, READMEs, releases, etc.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@GSadee @Zales0123 @mbabker @Arminek @arti0090