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

Code cleanup

Browse Source
This commit is contained in:
James Cole
2018-04-02 14:50:17 +02:00
parent 379b104778
commit fa7ab45a40
100 changed files with 440 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,12 +22,11 @@ declare(strict_types=1);
namespace FireflyIII\Services\Spectre\Request;
use Exception;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Services\Spectre\Exception\SpectreException;
use FireflyIII\User;
use Log;
use Requests;
use Requests_Exception;
use Requests_Response;
/**
@@ -44,9 +43,9 @@ abstract class SpectreRequest
/** @var string */
protected $serviceSecret = '';
/** @var string */
private $privateKey = '';
private $privateKey;
/** @var string */
private $server = '';
private $server;
/** @var User */
private $user;
@@ -198,11 +197,11 @@ abstract class SpectreRequest
Log::debug('Final headers for spectre signed get request:', $headers);
try {
$response = Requests::get($fullUri, $headers);
} catch (Requests_Exception $e) {
} catch (Exception $e) {
throw new FireflyException(sprintf('Request Exception: %s', $e->getMessage()));
}
$this->detectError($response);
$statusCode = intval($response->status_code);
$statusCode = (int)$response->status_code;
$body = $response->body;
$array = json_decode($body, true);
@@ -241,7 +240,7 @@ abstract class SpectreRequest
Log::debug('Final headers for spectre signed POST request:', $headers);
try {
$response = Requests::post($fullUri, $headers, $body);
} catch (Requests_Exception $e) {
} catch (Exception $e) {
throw new FireflyException(sprintf('Request Exception: %s', $e->getMessage()));
}
$this->detectError($response);
@@ -274,7 +273,7 @@ abstract class SpectreRequest
throw new FireflyException(sprintf('Error of class %s: %s', $errorClass, $message));
}
$statusCode = intval($response->status_code);
$statusCode = (int)$response->status_code;
if (200 !== $statusCode) {
throw new FireflyException(sprintf('Status code %d: %s', $statusCode, $response->body));
}