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

Ignore unreachable statement #2352

Merged
merged 1 commit into from
Aug 2, 2021
Merged

Ignore unreachable statement #2352

merged 1 commit into from
Aug 2, 2021

Conversation

franmomu
Copy link
Contributor

@franmomu franmomu commented Aug 2, 2021

Q A
Type bug
BC Break no
Fixed issues

Summary

In 2.3.x we ignore this issue it in the baseline: #2345

I've tried to cherry-pick the commit, but it was a bit of mess because in 2.2.x this file is using tabs and in 2.3.x is using spaces (and it has been modified), so to not add more conflicts we can just ignore it in the code.

@franmomu franmomu requested a review from alcaeus August 2, 2021 11:20
@franmomu franmomu mentioned this pull request Aug 2, 2021
Merged
alcaeus
alcaeus approved these changes Aug 2, 2021
View reviewed changes
Copy link
Member

@alcaeus alcaeus left a comment

Choose a reason for hiding this comment

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

LGTM

@alcaeus alcaeus added the Task label Aug 2, 2021
@alcaeus alcaeus self-assigned this Aug 2, 2021
@alcaeus alcaeus merged commit f2f94ea into doctrine:2.2.x Aug 2, 2021
@alcaeus
Copy link
Member

alcaeus commented Aug 2, 2021

I suppose we'll want to remove this when merging up to 2.3.x?

@franmomu franmomu deleted the fix_phpstan_22 branch August 2, 2021 11:25
@franmomu
Copy link
Contributor Author

franmomu commented Aug 2, 2021

I suppose we'll want to remove this when merging up to 2.3.x?

exactly 👍

alcaeus added a commit that referenced this pull request Aug 5, 2021
@alcaeus
Merge branch '2.2.x' into 2.2.x-merge-up-into-2.3.x_iA5R4YuE
4a6f291 
* 2.2.x:
  allow to reset hydration setting for Aggregation (#2353)
  Fix missing hint query option during find (#2351)
  Ignore unreachable statement (#2352)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alcaeus alcaeus alcaeus approved these changes

Assignees

@alcaeus alcaeus

Labels
Task
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@franmomu @alcaeus