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

Cherry-pick stuff from 2.x into master #7405

Merged
merged 13 commits into from
Sep 24, 2018
Merged

Cherry-pick stuff from 2.x into master #7405

merged 13 commits into from
Sep 24, 2018

Conversation

Majkl578
Copy link
Contributor

Majkl578 and others added 13 commits September 23, 2018 04:24
@Majkl578
Use non-deprecated version of Lexer and Inflector
b9feae0
@Majkl578
Fix compatibility with DBAL 2.8 where OFFSET 0 is no longer generated (…
2df7444 
…doctrine/dbal#3157)
@Majkl578
Fix doctrine#7286: StringPrimary no longer accepts aggregate function…
362ccb4 
…s as argument
@Majkl578
Handle removed parameters by tree walker in Paginator
a203734
@BenMorel @Majkl578
Typo fix
f62cccb
@guilliamxavier @Majkl578
correct load-only DOMDocument constructor in test
1157a84
@philippe-unitiz @Majkl578
Fix constructor and add() argument types in Query\Base
730543f
@bobdenotter @Majkl578
Fix docblock in inheritance-mapping.rst
6ff677d
@stof @Majkl578
Add a test reproducing GH7259
6219f72
@stof @Majkl578
Add a unit test reproducing the commit order regression
2431bc4
@stof @Majkl578
Fix the computation of commit order for circular dependencies
a59ae2e 
When finding a circular dependencies, we must ensure that all dependencies
of a node have been visited before adding it to the sorted list.
@sserbin @Majkl578
Query\Expr::andX(): added string as allowed parameter type
2f52024
@timdev @Majkl578
Fix for BC break doctrine#7366 when calling EM::find() with LockMode:…
ce76688 
…:OPTIMISTIC outside of a TX
@Majkl578 Majkl578 requested a review from Ocramius September 23, 2018 05:09
Ocramius
Ocramius approved these changes Sep 24, 2018
View reviewed changes
Copy link
Member

@Ocramius Ocramius left a comment

Choose a reason for hiding this comment

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

🚢

@Ocramius Ocramius merged commit 36aeed4 into doctrine:master Sep 24, 2018
@Majkl578 Majkl578 deleted the 2.x-into-master branch October 5, 2018 16:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ocramius Ocramius Ocramius approved these changes

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

Successfully merging this pull request may close these issues.
9 participants
@Majkl578 @Ocramius @BenMorel @guilliamxavier @philippe-unitiz @bobdenotter @stof @sserbin @timdev