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

Various PSR12 code cleanup

Browse Source
This commit is contained in:
James Cole
2022-12-29 19:42:26 +01:00
parent dbf3e76ecc
commit 6cfdc58cb1
415 changed files with 7462 additions and 6874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/Services/FireflyIIIOrg/Update/UpdateRequest.php
View File

@@ -37,7 +37,7 @@ use Log;
class UpdateRequest implements UpdateRequestInterface
{
/**
* @param string $channel
* @param string $channel
*
* @return array
*/
@@ -46,7 +46,7 @@ class UpdateRequest implements UpdateRequestInterface
Log::debug(sprintf('Now in getUpdateInformation(%s)', $channel));
$information = [
'level' => 'error',
'message' => (string) trans('firefly.unknown_error'),
'message' => (string)trans('firefly.unknown_error'),
];
// try get array from update server:
@@ -64,7 +64,7 @@ class UpdateRequest implements UpdateRequestInterface
}
/**
* @param string $channel
* @param string $channel
*
* @return array
*/
@@ -76,7 +76,7 @@ class UpdateRequest implements UpdateRequestInterface
'version' => config('firefly.version'),
'date' => Carbon::today()->startOfDay(),
'level' => 'error',
'message' => (string) trans('firefly.unknown_error'),
'message' => (string)trans('firefly.unknown_error'),
];
$url = config('firefly.update_endpoint');
@@ -101,12 +101,12 @@ class UpdateRequest implements UpdateRequestInterface
if (200 !== $res->getStatusCode()) {
Log::error(sprintf('Response status from server is %d.', $res->getStatusCode()));
Log::error((string) $res->getBody());
Log::error((string)$res->getBody());
$return['message'] = sprintf('Error: %d', $res->getStatusCode());
return $return;
}
$body = (string) $res->getBody();
$body = (string)$res->getBody();
try {
$json = json_decode($body, true, 512, JSON_THROW_ON_ERROR);
} catch (JsonException $e) {
@@ -134,7 +134,7 @@ class UpdateRequest implements UpdateRequestInterface
}
/**
* @param array $information
* @param array $information
*
* @return array
*/
@@ -143,7 +143,7 @@ class UpdateRequest implements UpdateRequestInterface
Log::debug('Now in parseResult()', $information);
$return = [
'level' => 'error',
'message' => (string) trans('firefly.unknown_error'),
'message' => (string)trans('firefly.unknown_error'),
];
$current = config('firefly.version');
$latest = $information['version'];
@@ -154,7 +154,7 @@ class UpdateRequest implements UpdateRequestInterface
// -1: you're running a newer version:
if (-1 === $compare) {
$return['level'] = 'info';
$return['message'] = (string) trans('firefly.update_newer_version_alert', ['your_version' => $current, 'new_version' => $latest]);
$return['message'] = (string)trans('firefly.update_newer_version_alert', ['your_version' => $current, 'new_version' => $latest]);
Log::debug('User is running a newer version', $return);
return $return;
@@ -162,7 +162,7 @@ class UpdateRequest implements UpdateRequestInterface
// running the current version:
if (0 === $compare) {
$return['level'] = 'info';
$return['message'] = (string) trans('firefly.update_current_version_alert', ['version' => $current]);
$return['message'] = (string)trans('firefly.update_current_version_alert', ['version' => $current]);
Log::debug('User is the current version.', $return);
return $return;
@@ -177,11 +177,12 @@ class UpdateRequest implements UpdateRequestInterface
// it's still very fresh, and user wants a stable release:
if ($diff <= $expectedDiff) {
$return['level'] = 'info';
$return['message'] = (string) trans(
$return['message'] = (string)trans(
'firefly.just_new_release',
['version' => $latest,
'date' => $released->isoFormat((string) trans('config.month_and_day_js')),
'days' => $expectedDiff,
[
'version' => $latest,
'date' => $released->isoFormat((string)trans('config.month_and_day_js')),
'days' => $expectedDiff,
]
);
Log::debug('Release is very fresh.', $return);
@@ -191,12 +192,13 @@ class UpdateRequest implements UpdateRequestInterface
// it's been around for a while:
$return['level'] = 'success';
$return['message'] = (string) trans(
$return['message'] = (string)trans(
'firefly.update_new_version_alert',
[
'your_version' => $current,
'new_version' => $latest,
'date' => $released->isoFormat((string) trans('config.month_and_day_js'))]
'date' => $released->isoFormat((string)trans('config.month_and_day_js')),
]
);
Log::debug('New release is old enough.');

2
app/Services/FireflyIIIOrg/Update/UpdateRequestInterface.php
View File

@@ -30,7 +30,7 @@ namespace FireflyIII\Services\FireflyIIIOrg\Update;
interface UpdateRequestInterface
{
/**
* @param string $channel
* @param string $channel
*
* @return array
*/