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

Manual merge #792

Merged
merged 5 commits into from
Jan 14, 2018
Merged

Manual merge #792

merged 5 commits into from
Jan 14, 2018

Conversation

greg0ire
Copy link
Contributor

Just approve, don't merge.

Dariusz Markowicz and others added 2 commits January 2, 2018 12:07
ProxyQuery::addOrderedColumns does not support all syntax variants and operate on an unparsed query. AST walker solves adding missing items from OrderBy to Select problem in the right way. Fix Invalid PathExpression error.
jordisala1991
jordisala1991 previously approved these changes Jan 14, 2018
@greg0ire
Copy link
Contributor Author

The build is broken because of doctrine type hints, and I think this should be fixed on the stable branch

@jordisala1991
Copy link
Member

Type hints or because of the strict type declaration?

@greg0ire
Copy link
Contributor Author

unsure yet, but doctrine 2.6 is out, and I think it might have string type hints.

@greg0ire
Copy link
Contributor Author

Extracting the interesting part: /home/travis/build/sonata-project/SonataDoctrineORMAdminBundle/vendor/sonata-project/admin-bundle/src/Admin/BaseFieldDescription.php:265

@greg0ire
Copy link
Contributor Author

@greg0ire
Copy link
Contributor Author

might be fixed in this bundle since its a passthrough

@jordisala1991
Copy link
Member

Ohh yes.. I see better now. We have to fix it on stable indeed, add a cast should fix it right?

@greg0ire
Copy link
Contributor Author

Not sure yet, I think it might just be the tests that need fixing

@greg0ire
Copy link
Contributor Author

Updating because I don't reproduce it locally, I must have an old version of doctrine

@greg0ire
Copy link
Contributor Author

Ok now I reproduce the issue

@greg0ire
Copy link
Contributor Author

See #793

@greg0ire greg0ire merged commit b2a5039 into sonata-project:master Jan 14, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants