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

Backport of "LimitSubqueryOutputWalker: fix aliasing of property in OrderBy from MappedSuperclass" #1512

Merged
merged 3 commits into from
Nov 16, 2015
Merged

Backport of "LimitSubqueryOutputWalker: fix aliasing of property in OrderBy from MappedSuperclass" #1512

merged 3 commits into from
Nov 16, 2015

Conversation

neoglez
Copy link

@neoglez neoglez commented Sep 21, 2015

Backport of "LimitSubqueryOutputWalker: fix aliasing of property in OrderBy from MappedSuperclass" ( e501137 )
See my comment on neoglez@a3ece3b

@neoglez
UnitTest backport of "Failing test case for broken paginator case"
a3ece3b 
UnitTest backport of "Failing test case for broken paginator case" ( 192da14 ).
The branch 2.x is very important because it's related to ZF2 doctrine module (see https://github.com/doctrine/DoctrineORMModule/blob/master/composer.json ) and specially this issue affects the use case of extending the ZF2 user entity defined in ZfcUser ( https://github.com/ZF-Commons/ZfcUser ).
This test is meant to show the need of the backport of e501137
@neoglez
Backport of "fix aliasing of property in OrderBy from MappedSuperclass"
ed637e5 
Backport of "LimitSubqueryOutputWalker: fix aliasing of property in OrderBy from MappedSuperclass" ( e501137 )
See my comment on https://github.com/neoglez/doctrine2/commit/a3ece3b419fa7bfe50ccf2a48d83545aa007fbe8
@doctrinebot
Copy link

Hello,

thank you for creating this pull request. However did not open it on the "master"
branch. Our Git workflow requires all pull requests to go through "master" branch
and the release masters then merge them back into stable branches, if they are
bug fixes.

Please open the pull request again for the "master" branch and close
this one.

Nevertheless I have opened a Jira ticket for this Pull Request to track this
issue:

http://www.doctrine-project.org/jira/browse/DDC-3911

We use Jira to track the state of pull requests and the versions they got
included in.

@neoglez
Copy link
Author

neoglez commented Sep 21, 2015

By the way I'm aware of

Our branching strategy is "everything to master first", even bugfixes and we then merge them into the stable branches. You should only open pull requests against the master branch. Otherwise we cannot accept the PR.

but i think this could apply here

There is one exception to the rule, when we merged a bug into some stable branches we do occasionally accept pull requests that merge the same bug fix into earlier branches.

@neoglez
Copy link
Author

neoglez commented Sep 21, 2015

Oops, forgot to commit the Entity

@jschroed91
Copy link

Any chance of this getting merged soon, or a release master merging the original fix back into the 2.5 branch?

guilhermeblanco added a commit that referenced this pull request Nov 16, 2015
@guilhermeblanco
Merge pull request #1512 from neoglez/2.5
04254a8 
Backport of "LimitSubqueryOutputWalker: fix aliasing of property in OrderBy from MappedSuperclass"
@guilhermeblanco guilhermeblanco merged commit 04254a8 into doctrine:2.5 Nov 16, 2015
@neoglez neoglez deleted the 2.5 branch November 16, 2015 07:18
@doctrinebot doctrinebot mentioned this pull request Dec 6, 2015
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@neoglez @doctrinebot @jschroed91 @guilhermeblanco