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

Avoid calling merge() #9489

Merged
merged 1 commit into from
Feb 8, 2022
Merged

Conversation

derrabus
Copy link
Member

@derrabus derrabus commented Feb 8, 2022

Backported from #9488.

This test case uses the deprecated merge() method although it's not actually testing the behavior of that method. I've replaced merge() with a find() call.

@derrabus derrabus added this to the 2.12.0 milestone Feb 8, 2022
@derrabus derrabus merged commit 182bcba into doctrine:2.12.x Feb 8, 2022
@derrabus derrabus deleted the improvement/avoid-merge branch February 8, 2022 23:42
derrabus added a commit to derrabus/orm that referenced this pull request Feb 9, 2022
* 2.12.x:
  Fix types on QueryBuilder (doctrine#9492)
  Fix types on EntityRepository (doctrine#9474)
  Avoid calling merge() (doctrine#9489)
  PHPStan 1.4.6, Psalm 4.20.0 (doctrine#9491)
  Fix `#[DiscriminatorMap]` params (doctrine#9487)
  Run tests with stricter error handling (doctrine#9482)
n-e-m-a-nj-a pushed a commit to n-e-m-a-nj-a/orm that referenced this pull request Mar 29, 2022
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

2 participants