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

Clean elses #1691

Merged
merged 1 commit into from
Dec 22, 2017
Merged

Clean elses #1691

merged 1 commit into from
Dec 22, 2017

Conversation

carusogabriel
Copy link
Contributor

I've removed the elses when we have already returned something 🚮

@malarzm
Copy link
Member

malarzm commented Dec 14, 2017

As this overlaps with what's happening right now in odm-ng branch (I think) I'm leaving the merge decision up to @alcaeus :)

@carusogabriel
Copy link
Contributor Author

Didn't know that was a branch for next version development already 😅

@malarzm
Copy link
Member

malarzm commented Dec 14, 2017

There's that big #1553 that switches us to the new driver and moves all relevant things (including query/aggregation builders) from doctrine/mongodb into the ODM :)

@alcaeus alcaeus added this to the 2.0.0 milestone Dec 15, 2017
@alcaeus
Copy link
Member

alcaeus commented Dec 15, 2017

I've tagged this for the 2.0 milestone and will take a look once #1553 has been merged down. I'll try to get that done within a week or so, after that improvement PRs such as this can be based on odm-ng (or master if I can finally push myself to just merge odm-ng down).

@alcaeus
Copy link
Member

alcaeus commented Dec 22, 2017

@carusogabriel could you rebase this pull request?

@carusogabriel
Copy link
Contributor Author

Sure, I’ll rebase and search for similars 👨‍💻

@carusogabriel
Copy link
Contributor Author

@alcaeus Only one test failed because of Mongo. Should we retrigger it?

@alcaeus
Copy link
Member

alcaeus commented Dec 22, 2017

Done.

@alcaeus alcaeus merged commit 93451ba into doctrine:master Dec 22, 2017
@alcaeus
Copy link
Member

alcaeus commented Dec 22, 2017

Thanks @carusogabriel!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants