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

Proper check for curl error zero. (bunq/sdk_php#7) #148

Merged
merged 5 commits into from
May 29, 2018
Merged

Proper check for curl error zero. (bunq/sdk_php#7) #148

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
281ab1b
Proper check for curl error zero. (bunq/sdk_php#7)
OGKevin May 28, 2018
325d390
Minor forammting fixes. (bunq/sdk_php#7)
OGKevin May 28, 2018
d5641dd
Formatted error message accordingly. (bunq/sdk_php#7)
OGKevin May 29, 2018
6474a8c
Better error formatting. (bunq/sdk_php#7)
OGKevin May 29, 2018
b3fcc16
Removed spacing from error format. (bunq/sdk_php#7)
OGKevin May 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions src/Http/ApiClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Copy link

Choose a reason for hiding this comment

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

Should this not be indented, as it is a confutation of the previous line?


/**
* Public key locations.
Expand Down Expand Up @@ -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+)/';
Copy link

Choose a reason for hiding this comment

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

constant comment

const REGEX_NAMED_GOUP_ERROR_CODE = 'errorCode';

/**
* @var Client
*/
Expand Down Expand Up @@ -209,7 +212,7 @@ private function request(
$this->determineRequestOptions($body, $customHeaders)
);
} catch (RequestException $exception) {
if ($exception->getCode() === self::ERROR_CODE_MAC_OS_CURL_BUG && $this->isMacOs()) {
if ($this->isCurlErrorCodeZero($exception) && $this->isMacOs()) {
die(vsprintf(self::ERROR_MAC_OS_CURL_VERSION, [$this->determineVersionPhpMacOs(), PHP_EOL]));
} else {
throw $exception;
Expand Down Expand Up @@ -375,6 +378,21 @@ protected function determineBodyString($body): string
return $bodyString;
}

/**
* @param RequestException $exception
*
* @return bool
*/
private function isCurlErrorCodeZero(RequestException $exception): bool
{
$allMatch = [];

preg_match(self::REGEX_CURL_ERROR_CODE, $exception->getMessage(), $allMatch);

return isset($allMatch[self::REGEX_NAMED_GOUP_ERROR_CODE]) &&
Copy link

Choose a reason for hiding this comment

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

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 ;)

$allMatch[self::REGEX_NAMED_GOUP_ERROR_CODE] === self::ERROR_CODE_MAC_OS_CURL_BUG;
}

/**
* @return bool
*/
Expand Down