AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add response body to InvalidStatusException

Browse Source
This commit is contained in:
Frédéric Guillot
2018-03-02 13:41:37 -08:00
parent ebe04e672c
commit f92eb448cb
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Core/Http/Client.php
View File

@@ -164,7 +164,6 @@ class Client extends Base
$startTime = microtime(true); $startTime = microtime(true);
$stream = @fopen(trim($url), 'r', false, stream_context_create($this->getContext($method, $content, $headers, $raiseForErrors))); $stream = @fopen(trim($url), 'r', false, stream_context_create($this->getContext($method, $content, $headers, $raiseForErrors)));
$response = '';
if (! is_resource($stream)) { if (! is_resource($stream)) {
$this->logger->error('HttpClient: request failed ('.$url.')'); $this->logger->error('HttpClient: request failed ('.$url.')');
@@ -176,14 +175,14 @@ class Client extends Base
return ''; return '';
} }
$response = stream_get_contents($stream); $body = stream_get_contents($stream);
$metadata = stream_get_meta_data($stream); $metadata = stream_get_meta_data($stream);
if ($raiseForErrors && array_key_exists('wrapper_data', $metadata)) { if ($raiseForErrors && array_key_exists('wrapper_data', $metadata)) {
$statusCode = $this->getStatusCode($metadata['wrapper_data']); $statusCode = $this->getStatusCode($metadata['wrapper_data']);
if ($statusCode >= 400) { if ($statusCode >= 400) {
throw new InvalidStatusException('Request failed with status code '.$statusCode, $statusCode); throw new InvalidStatusException('Request failed with status code '.$statusCode, $statusCode, $body);
} }
} }
@@ -192,11 +191,11 @@ class Client extends Base
$this->logger->debug('HttpClient: headers='.var_export($headers, true)); $this->logger->debug('HttpClient: headers='.var_export($headers, true));
$this->logger->debug('HttpClient: payload='.$content); $this->logger->debug('HttpClient: payload='.$content);
$this->logger->debug('HttpClient: metadata='.var_export($metadata, true)); $this->logger->debug('HttpClient: metadata='.var_export($metadata, true));
$this->logger->debug('HttpClient: response='.$response); $this->logger->debug('HttpClient: body='.$body);
$this->logger->debug('HttpClient: executionTime='.(microtime(true) - $startTime)); $this->logger->debug('HttpClient: executionTime='.(microtime(true) - $startTime));
} }
return $response; return $body;
} }
/** /**

9
app/Core/Http/InvalidStatusException.php
View File

@@ -5,15 +5,22 @@ namespace Kanboard\Core\Http;
class InvalidStatusException extends ClientException class InvalidStatusException extends ClientException
{ {
protected $statusCode = 0; protected $statusCode = 0;
protected $body = '';
public function __construct($message, $statusCode) public function __construct($message, $statusCode, $body)
{ {
parent::__construct($message); parent::__construct($message);
$this->statusCode = $statusCode; $this->statusCode = $statusCode;
$this->body = $body;
} }
public function getStatusCode() public function getStatusCode()
{ {
return $this->statusCode; return $this->statusCode;
} }
public function getBody()
{
return $this->body;
}
} }