Proper check for curl error zero. (bunq/sdk_php#7) #148
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@JordyHeemskerk please 👀 |
JordyHeemskerk
requested changes
May 28, 2018
src/Http/ApiClient.php
Outdated
| @@ -40,7 +40,7 @@ class ApiClient | |||
| */ | |||
| const ERROR_ENVIRONMENT_TYPE_UNKNOWN = 'Unknown environmentType "%s"'; | |||
| const ERROR_MAC_OS_CURL_VERSION = 'Your PHP seems to be linked to the MacOS provided curl binary. ' . | |||
| 'This is incompatible with our SDK, please reinstall by running: "brew reinstall %s --with-homebrew-curl".%s'; | |||
| 'This is incompatible with our SDK, please reinstall by running: "brew reinstall %s --with-homebrew-curl".%s'; | |||
There was a problem hiding this comment.
Should this not be indented, as it is a confutation of the previous line?
src/Http/ApiClient.php
Outdated
| @@ -130,6 +130,9 @@ class ApiClient | |||
| */ | |||
| const COMMAND_DETERMINE_BREW_PHP_VERSION = 'brew list | egrep -e "^php[0-9]{2}$"'; | |||
|
|
|||
| const REGEX_CURL_ERROR_CODE = '/(cURL error )(?P<errorCode>\d+)/'; | |||
src/Http/ApiClient.php
Outdated
|
|
||
| preg_match(self::REGEX_CURL_ERROR_CODE, $exception->getMessage(), $allMatch); | ||
|
|
||
| return isset($allMatch[self::REGEX_NAMED_GOUP_ERROR_CODE]) && |
There was a problem hiding this comment.
Just a (personal preference) but I like the && on the newline, this makes it easier to understand / spot the operators (in longer lists). But this is also fine, just my 2 cents ;)
|
@JordyHeemskerk pushed. |
JordyHeemskerk
requested changes
May 29, 2018
src/Http/ApiClient.php
Outdated
| */ | ||
| const FORMAT_CURL_INSTALLATION_INSTRUCTIONS = | ||
| 'This is incompatible with our SDK, please reinstall by running: "brew reinstall %s --with-homebrew-curl".%s'; | ||
| const FORMAT_ERROR_MESSAGE_MAC_CURL = '%s %s %s'; |
There was a problem hiding this comment.
Remove the spaces, otherwise the second line will start with a space, and there will be a useless trailing space after the first line as well.
JordyHeemskerk
approved these changes
May 29, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
References #7