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

Add total hits relation in ResultSelt #1694

Merged
merged 3 commits into from
Nov 18, 2019

Conversation

deguif
Copy link
Collaborator

@deguif deguif commented Nov 14, 2019

No description provided.

@ruflin
Copy link
Owner

ruflin commented Nov 18, 2019

Could you add a changelog entry and if possible add a small functional tests?

@deguif deguif force-pushed the add-total-hits-relation branch 2 times, most recently from c0a013b to 79f0fd0 Compare November 18, 2019 13:33
@deguif
Copy link
Collaborator Author

deguif commented Nov 18, 2019

@ruflin @thePanz tests and changelog entry were added

CHANGELOG.md Outdated
@@ -59,6 +59,7 @@ All notable changes to this project will be documented in this file based on the
### Added

* support for elasticsearch-php ^7.0
* Added `\Elastica\ResultSet::getTotalHitsRelation()` to get relation for total hits [#1694](https://github.com/ruflin/Elastica/pull/1694)
Copy link
Collaborator

Choose a reason for hiding this comment

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

This line should be added to the "unreleased" changes, after line 10!

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Oups, I messed up with the previous changes, I fixed that

Copy link
Collaborator Author

@deguif deguif Nov 18, 2019

Choose a reason for hiding this comment

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

@ruflin @thePanz do you think that can be merged now, as I will have to rebase my other PR as I changed many lines in the changelog here

@deguif deguif force-pushed the add-total-hits-relation branch from 79f0fd0 to dd05a94 Compare November 18, 2019 14:00
@ruflin ruflin merged commit ae80d34 into ruflin:master Nov 18, 2019
@ruflin
Copy link
Owner

ruflin commented Nov 18, 2019

@deguif Merged. Thanks for also cleaning up the other changelog entries, miss that in the PR review :-(

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.

3 participants