Skip to content

removed an else condition, fixed a parameter annotation and make little improvements #3008

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

Conversation

AlessandroMinoccheri
Copy link
Contributor

No description provided.

@Ocramius
Copy link
Member

Ocramius commented Feb 2, 2018

@AlessandroMinoccheri please don't merge master: rebase instead

@AlessandroMinoccheri
Copy link
Contributor Author

Ok, sorry for the merge... do you prefer to close this and open another wth the rebase @Ocramius ?

@Ocramius
Copy link
Member

Ocramius commented Feb 2, 2018

You can just rebase your branch and force-push it 👍

@AlessandroMinoccheri AlessandroMinoccheri force-pushed the improve_code_inside_query_directory branch from edb4c7e to 6987bda Compare February 2, 2018 09:27
@AlessandroMinoccheri
Copy link
Contributor Author

Sure, no problem to do It

@AlessandroMinoccheri
Copy link
Contributor Author

AlessandroMinoccheri commented Feb 2, 2018

rebase done but travis fails... @Ocramius

@Ocramius
Copy link
Member

Ocramius commented Feb 2, 2018

@AlessandroMinoccheri failure is clear tho (and related to this change): https://travis-ci.org/doctrine/dbal/jobs/336473229#L576-L582

@AlessandroMinoccheri AlessandroMinoccheri force-pushed the improve_code_inside_query_directory branch 2 times, most recently from 3548d42 to 603be11 Compare February 2, 2018 11:46
@AlessandroMinoccheri AlessandroMinoccheri force-pushed the improve_code_inside_query_directory branch from 603be11 to 018e0d2 Compare February 2, 2018 12:53
@AlessandroMinoccheri
Copy link
Contributor Author

Fixed travis tests

@Ocramius Ocramius self-assigned this Feb 2, 2018
@Ocramius Ocramius added this to the 2.7.0 milestone Feb 2, 2018
@Ocramius
Copy link
Member

Ocramius commented Feb 2, 2018

@AlessandroMinoccheri thanks!

@Ocramius Ocramius merged commit 4ea3b4d into doctrine:master Feb 2, 2018
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 13, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants