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

Fix QueryBuilder::getParameter() on parameter names with colons #8107

Merged
merged 2 commits into from
Jul 5, 2020
Merged

Fix QueryBuilder::getParameter() on parameter names with colons #8107

merged 2 commits into from
Jul 5, 2020

Conversation

tom93
Copy link
Contributor

@tom93 tom93 commented Apr 15, 2020 •
edited
Loading

Fixes #8106.

This change can be backported to the stable release (2.7), but will cause a small merge conflict because it builds on commit 17e7c2a42 which hasn't been backported.
Update: has been backported from master to 2.7 as requested.

@tom93 tom93 mentioned this pull request Apr 15, 2020
Closed
@SenseException
Copy link
Member

Hi. You should target 2.7 instead of master for your PR. Please also make sure that the build doesn't break and is green.

@tom93 tom93 changed the base branch from master to 2.7 April 19, 2020 05:48
@tom93
Copy link
Contributor Author

tom93 commented Apr 19, 2020 •
edited
Loading

@SenseException Done.
I added a separate commit which partially backports the relevant type cast from commit 17e7c2a. Hopefully this will make it easier to merge/cherry-pick my change into 'master' later on.
(For future reference, my original commit on the 'master' branch was 30ba5c5.)

beberlei
beberlei requested changes Jul 5, 2020
View reviewed changes
Copy link
Member

@beberlei beberlei left a comment

Choose a reason for hiding this comment

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

Can you move the test to QueryTest instead please? Only testing for Query::getParameter() is already enough as well, the test case covers too much lines for the simple thing it asserts.

@beberlei beberlei added this to the 2.7.4 milestone Jul 5, 2020
@beberlei beberlei merged commit 3689b76 into doctrine:2.7 Jul 5, 2020
@beberlei
Copy link
Member

beberlei commented Jul 5, 2020

Simplified test in 181114f

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@beberlei beberlei beberlei requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.7.4
Development

Successfully merging this pull request may close these issues.

QueryBuilder::setParameter() breaks if parameter name with ':' is set multiple times
4 participants
@tom93 @SenseException @beberlei @Majkl578