Skip to content

Pass potential api response data to PostmenException. #27

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

Open
d-ph wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Pass potential api response data to PostmenException. #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 9 additions & 10 deletions src/Postmen/Postmen.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ public function processCurlResponse($response, $parameters) {
}
}

public function handleError($err_message, $err_code, $err_retryable, $err_details, $parameters) {
$error = new PostmenException($err_message, $err_code, $err_retryable, $err_details);
public function handleError($err_message, $err_code, $err_retryable, $err_details, $parameters, $response_data = null) {
$error = new PostmenException($err_message, $err_code, $err_retryable, $err_details, null, $response_data);
if ($parameters['safe']) {
$this->_error = $error;
} else {
Expand All @@ -185,6 +185,11 @@ public function handleError($err_message, $err_code, $err_retryable, $err_detail
}

public function handle($parsed, $parameters) {
$response_data = $parsed->data;
if ($parameters['array']) {
$parsed_array = json_decode(json_encode($parsed), true);
$response_data = $parsed_array['data'];
}
if ($parsed->meta->code != 200) {
$err_code = 0;
$err_message = 'Postmen server side error occured';
Expand Down Expand Up @@ -217,15 +222,9 @@ public function handle($parsed, $parameters) {
return $retried;
}
}
return $this->handleError($err_message, $err_code, $err_retryable, $err_details, $parameters);
} else {
if ($parameters['array']) {
$parsed_array = json_decode(json_encode($parsed), true);
return $parsed_array['data'];
} else {
return $parsed->data;
}
return $this->handleError($err_message, $err_code, $err_retryable, $err_details, $parameters, $response_data);
}
return $response_data;
}

/** takes an associative array $config as argument
Expand Down
16 changes: 14 additions & 2 deletions src/Postmen/PostmenException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,18 @@ class PostmenException extends Exception
{
private $retryable;
private $details;

public function __construct($message, $code, $retryable, $details, Exception $previous = null) {

/**
* @var \stdClass|array|null If the error happened during running an api request and the api responded, then this
* is the related response. Depending on whether the requests was done with "array: true/false" parameter, the response
* is either a \stdClass object or an array.
*/
private $response_data;

public function __construct($message, $code, $retryable, $details, Exception $previous = null, $response_data = null) {
$this->retryable = $retryable;
$this->details = $details;
$this->response_data = $response_data;
parent::__construct($message, $code, $previous);
}

Expand All @@ -28,4 +36,8 @@ public function getDetails() {
return $this->details;
}

public function getResponseData() {
return $this->response_data;
}

}