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

Remove ORM 2.10 conflict #13372

Merged
merged 1 commit into from Dec 9, 2021
Merged

Conversation

mbabker
Copy link
Contributor

@mbabker mbabker commented Dec 9, 2021

Q A
Branch? 1.10
Bug fix? no
New feature? no
BC breaks? no
Deprecations? no
Related tickets N/A
License MIT

The conflict against doctrine/orm:^2.10 has been unnecessary since the gedmo/doctrine-extensions 3.2 release. In fact, the actual conflict was between the extensions package and the ORM, Sylius was never directly conflicted against it. Now that newer versions of the extensions package either have the appropriate conflict or fixed the conflict and now require newer ORM versions, Sylius no longer needs to have this conflict.

@mbabker mbabker requested a review from a team as a code owner December 9, 2021 01:26
@probot-autolabeler probot-autolabeler bot added the Maintenance CI configurations, READMEs, releases, etc. label Dec 9, 2021
Copy link
Member

@lchrusciel lchrusciel left a comment

Choose a reason for hiding this comment

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

Perhaps we should bump minimal requirement for "gedmo/doctrine-extensions": "^2.4.12 || ^3.0", to "gedmo/doctrine-extensions": "^2.4.12 || ^3.2",

@lchrusciel lchrusciel merged commit fcaeee5 into Sylius:1.10 Dec 9, 2021
@lchrusciel
Copy link
Member

Thanks, Michael! 🥇

@mbabker mbabker deleted the remove-orm-conflict branch December 9, 2021 20:57
@mbabker
Copy link
Contributor Author

mbabker commented Dec 9, 2021

Perhaps we should bump minimal requirement

2.4 isn't supported at all anymore and explicitly blocks PHP 8, so if you're going to bump this requirement then you should drop 2.4 support in full.

@lchrusciel
Copy link
Member

makes sense, as Sylius is ^8.0 already. Can you open a PR? Will be part of next release.

lchrusciel added a commit that referenced this pull request Dec 10, 2021
…rsions (mbabker)

This PR was merged into the 1.11-dev branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | master
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | yes
| Deprecations?   | no
| Related tickets | mentioned in #13372
| License         | MIT

The 2.x branch of `gedmo/doctrine-extensions` is no longer supported and isn't installable on PHP 8.  3.2 is set as the minimum to avoid allowing 3.0 or 3.1 to be installed with incompatible ORM versions.

Commits
-------

b33618a Drop support for older `gedmo/doctrine-extensions` versions
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants