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

Merge 2.9.x into 2.10.x #8999

Merged
merged 12 commits into from
Sep 11, 2021
Merged

Merge 2.9.x into 2.10.x #8999

merged 12 commits into from
Sep 11, 2021

Conversation

derrabus
Copy link
Member

@derrabus derrabus commented Sep 11, 2021

Don't merge yet: I'll backport all changes that were necessary to make the build pass.

@derrabus
Copy link
Member Author

Backport: #9000

@derrabus
Copy link
Member Author

Ready. 🙂

derrabus and others added 2 commits September 11, 2021 15:23
Remove Proxy from EntityManagerInterface contract
@greg0ire
Copy link
Member

Let's add #9001 ?

* 2.9.x:
  Remove Proxy from EntityManagerInterface contract
  Add extension point for the "embedded" XML node (doctrine#8992)
  Fix return type at `EntityManagerInterface::get(Partial)Reference()` (doctrine#8922)
  Fix class casing and avoid name collisions
  Remove unused performance base test class
  Drop unused test base classes
  Fix mapped superclass missing in discriminator map
@derrabus
Copy link
Member Author

Added.

@greg0ire greg0ire merged commit 5b3fb6a into doctrine:2.10.x Sep 11, 2021
@greg0ire
Copy link
Member

Thanks @derrabus !

@derrabus derrabus deleted the merge/2.9.x branch September 11, 2021 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants