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

[DoctrineBridge] Bumps doctrine/persistence to version 2.x #37416

Closed
wants to merge 1 commit into from
Closed

[DoctrineBridge] Bumps doctrine/persistence to version 2.x #37416

wants to merge 1 commit into from

Conversation

fruitwasp
Copy link
Contributor

@fruitwasp fruitwasp commented Jun 25, 2020

Q A
Branch? master (bumps to a new major version)
Bug fix? no
New feature? no
Deprecations? no
Tickets
License MIT
Doc PR

Adds support for doctrine/persistence version to 2.x. As it's a new major version, I've targeted the master branch. Relates to doctrine/DoctrineBundle#1181

Awating pull request to be merged in dependency doctrine/data-fixtures: doctrine/data-fixtures#349

@@ -19,7 +19,7 @@
"php": ">=7.2.5",
"ext-xml": "*",
"doctrine/event-manager": "~1.0",
"doctrine/persistence": "^1.3",
"doctrine/persistence": "^2.0",
Copy link
Member

Choose a reason for hiding this comment

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

Why not ^1.3|^2.0?

@nicolas-grekas
Copy link
Member

This should target branch 3.4 and compat with 1.* should be preserved.

@nicolas-grekas
Copy link
Member

Closing as staled, please resubmit when ready.

@derrabus
Copy link
Member

I've had a quick look.

This should target branch 3.4

On the 3.4 branch, we don't have any version constraints for doctrine/persistence.

On 4.4 and above, we're still blocked by doctrine/data-fixtures.

https://github.com/doctrine/data-fixtures/blob/ba588dfae2da361e8cb4908d2b2a21d09a47e8af/composer.json#L19

@derrabus
Copy link
Member

Continuation: #37639

nicolas-grekas added a commit that referenced this pull request Jul 23, 2020
This PR was squashed before being merged into the 4.4 branch.

Discussion
----------

Allow doctrine/persistence 2

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Tickets       | N/A
| License       | MIT
| Doc PR        | N/A

Replaces #37416.

This PR unblocks the installation of `doctrine/persistence` version 2.

Notes:
* I had to bump `doctrine/data-fixtures` because composer would otherwise downgrade to an ancient alpha release with incomplete version constraints. This package is a dev dependency for our tests, so I think we're good here.
  **edit**: Moved to #37640.
* Until doctrine/data-fixtures#349 has been resolved, Doctrine/Bridge cannot be tested with version 2 of `doctrine/persistence`.

Commits
-------

cd22fe6 Allow doctrine/persistence 2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants