Skip to content

Hotfix/geoips #273

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

Merged
merged 1 commit into from
Nov 6, 2013
Merged

Hotfix/geoips #273

merged 1 commit into from
Nov 6, 2013

Conversation

Thinkscape
Copy link
Member

Fix #267.

I've covered 100% of the API documentation, including all status and error codes and possible responses.

@@ -3,3 +3,12 @@ composer.lock
composer.phar
phpunit.xml
php-cs-fixer.phar

# common IDE dirs
Copy link
Contributor

Choose a reason for hiding this comment

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

those files should not be ignored per project, but within your global git config on your machine.

Copy link
Member Author

Choose a reason for hiding this comment

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

Well, yes. It's common practice in OSS projects, github auto-generates those etc. It's just a nice thing to have and helps contributors weed out unnecessary dirs. Not required and I'm not opinionated on it though.

Copy link
Member

Choose a reason for hiding this comment

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

I'd rather prefer not to include this change, especially in this PR.

Copy link
Member Author

Choose a reason for hiding this comment

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

ok

@willdurand
Copy link
Member

great job overall!

@Thinkscape
Copy link
Member Author

Thx Will.


if (!is_array($response) || !count($response)) {
throw new NoResultException(sprintf('Could not execute query %s', $query));
if (
Copy link
Member

Choose a reason for hiding this comment

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

so now you can wrap everything on a same line :)

@willdurand
Copy link
Member

You can squash your commits, and use PHP-CS-Fixer (just in case), and that will be perfect.

@Thinkscape
Copy link
Member Author

Done.

@willdurand
Copy link
Member

squash?

@Thinkscape
Copy link
Member Author

I've already pushed.

@Thinkscape
Copy link
Member Author

Unless you want a completely new branch, which means discussion will be lost.

@willdurand
Copy link
Member

na, but I want a single commit, not 6..

@Thinkscape
Copy link
Member Author

I can't rebase something that is already pushed. What I could do is rebase on a new branch and send new PR, but this will remove the diss. here.

@willdurand
Copy link
Member

well you can:

git rebase -i HEAD~6

Then:

git push origin hotfix/geoips -f

@Thinkscape
Copy link
Member Author

Strange, github accepted it.... ok then.

willdurand added a commit that referenced this pull request Nov 6, 2013
@willdurand willdurand merged commit 622ac5e into geocoder-php:master Nov 6, 2013
@willdurand
Copy link
Member

Thanks!

@willdurand
Copy link
Member

Release 2.3.2 includes this fix.

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.

Geoips not working (api change)
3 participants