kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-06 01:45:22 +00:00
Code Issues Projects Releases Wiki Activity

Last code optimization before release.

Browse Source
This commit is contained in:
James Cole
2018-07-28 10:45:16 +02:00
parent d35470a79e
commit 0c7b652a70
42 changed files with 217 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Services/Spectre/Request/SpectreRequest.php
View File

@@ -28,6 +28,7 @@ use FireflyIII\User;
use GuzzleHttp\Client;
use GuzzleHttp\Exception\GuzzleException;
use Log;
use RuntimeException;
/**
* Class SpectreRequest
@@ -208,7 +209,12 @@ abstract class SpectreRequest
throw new FireflyException(sprintf('Guzzle Exception: %s', $e->getMessage()));
}
$statusCode = $res->getStatusCode();
$returnBody = $res->getBody()->getContents();
try {
$returnBody = $res->getBody()->getContents();
} catch (RunTimeException $e) {
Log::error(sprintf('Could not get body from SpectreRequest::GET result: %s', $e->getMessage()));
$returnBody = '';
}
$this->detectError($returnBody, $statusCode);
$array = json_decode($returnBody, true);
@@ -252,7 +258,14 @@ abstract class SpectreRequest
} catch (GuzzleException|Exception $e) {
throw new FireflyException(sprintf('Guzzle Exception: %s', $e->getMessage()));
}
$body = $res->getBody()->getContents();
try {
$body = $res->getBody()->getContents();
} catch (RunTimeException $e) {
Log::error(sprintf('Could not get body from SpectreRequest::POST result: %s', $e->getMessage()));
$body = '';
}
$statusCode = $res->getStatusCode();
$this->detectError($body, $statusCode);