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

Bump query builder version to 7.0 #1693

Merged
merged 3 commits into from
Nov 18, 2019
Merged

Bump query builder version to 7.0 #1693

merged 3 commits into from
Nov 18, 2019

Conversation

deguif
Copy link
Collaborator

@deguif deguif commented Nov 14, 2019 •
edited
Loading

Follow-up of #1691

@deguif deguif force-pushed the bump-query-builder-version branch 2 times, most recently from c0ca3aa to b3c9119 Compare November 14, 2019 15:54
ruflin
ruflin approved these changes Nov 18, 2019
View reviewed changes
Copy link
Owner

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

LGTM

Now I also see that linting is failing and the reason for your other PR. The part I now wonder is why did linting not fail before? @thePanz might know more here.

@deguif
Copy link
Collaborator Author

deguif commented Nov 18, 2019

That's because there was a new version for PHP-CS-FIXER ;)

@deguif
Copy link
Collaborator Author

deguif commented Nov 18, 2019

@ruflin once #1695 gets merged, I will rebase and the tests should be green

@ruflin
Copy link
Owner

ruflin commented Nov 18, 2019

Hm, interesting. I would hope such changes would not break our CI. What we should probably do moving forward is have a fixed version of the php-cs-fixer linked here instead of ^ .. https://github.com/ruflin/Elastica/blob/master/env/elastica/Lint#L36 ?

@deguif deguif force-pushed the bump-query-builder-version branch from 58b0875 to 816f88e Compare November 18, 2019 09:24
@deguif deguif force-pushed the bump-query-builder-version branch from 816f88e to d21ff4d Compare November 18, 2019 09:31
@deguif
Copy link
Collaborator Author

deguif commented Nov 18, 2019

@ruflin rebased, and it's green now.

@ruflin ruflin merged commit d3dc5a7 into ruflin:master Nov 18, 2019
@ruflin
Copy link
Owner

ruflin commented Nov 18, 2019

Thanks, LGTM. Merged.

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

@ruflin ruflin ruflin 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.
2 participants
@deguif @ruflin