kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 01:42:32 +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

6
app/Services/Currency/FixerIO.php
View File

@@ -23,12 +23,12 @@ declare(strict_types=1);
namespace FireflyIII\Services\Currency;
use Carbon\Carbon;
use Exception;
use FireflyIII\Models\CurrencyExchangeRate;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\User;
use Log;
use Requests;
use Requests_Exception;
/**
* Class FixerIO.
@@ -53,7 +53,7 @@ class FixerIO implements ExchangeRateInterface
$result = Requests::get($uri);
$statusCode = $result->status_code;
$body = $result->body;
} catch (Requests_Exception $e) {
} catch (Exception $e) {
// don't care about error
$body = sprintf('Requests_Exception: %s', $e->getMessage());
}
@@ -69,7 +69,7 @@ class FixerIO implements ExchangeRateInterface
}
if (null !== $content) {
$code = $toCurrency->code;
$rate = isset($content['rates'][$code]) ? $content['rates'][$code] : '1';
$rate = $content['rates'][$code] ?? '1';
}
// create new currency exchange rate object:

8
app/Services/Currency/FixerIOv2.php
View File

@@ -23,12 +23,12 @@ declare(strict_types=1);
namespace FireflyIII\Services\Currency;
use Carbon\Carbon;
use Exception;
use FireflyIII\Models\CurrencyExchangeRate;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\User;
use Log;
use Requests;
use Requests_Exception;
/**
* Class FixerIOv2.
@@ -76,7 +76,7 @@ class FixerIOv2 implements ExchangeRateInterface
$statusCode = $result->status_code;
$body = $result->body;
Log::debug(sprintf('Result status code is %d', $statusCode));
} catch (Requests_Exception $e) {
} catch (Exception $e) {
// don't care about error
$body = sprintf('Requests_Exception: %s', $e->getMessage());
}
@@ -92,11 +92,11 @@ class FixerIOv2 implements ExchangeRateInterface
}
if (null !== $content) {
$code = $toCurrency->code;
$rate = $content['rates'][$code] ?? 0;
$rate = (float)($content['rates'][$code] ?? 0);
}
Log::debug('Got the following rates from Fixer: ', $content['rates'] ?? []);
$exchangeRate->rate = $rate;
if ($rate !== 0) {
if ($rate !== 0.0) {
$exchangeRate->save();
}