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

Import statements and update configuration.

Browse Source
This commit is contained in:
James Cole
2025-05-27 16:57:36 +02:00
parent 7c04c4c2bc
commit c074fec0a7
165 changed files with 530 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ use FireflyIII\Events\NewVersionAvailable;
use GuzzleHttp\Client;
use GuzzleHttp\Exception\GuzzleException;
use Illuminate\Support\Facades\Log;
use JsonException;
/**
* Class UpdateRequest
@@ -100,7 +101,7 @@ class UpdateRequest implements UpdateRequestInterface
try {
$json = \Safe\json_decode($body, true, 512, JSON_THROW_ON_ERROR);
} catch (\JsonException) {
} catch (JsonException) {
Log::error('Body is not valid JSON');
Log::error($body);
$return['message'] = 'Invalid JSON :(';

3
app/Services/Internal/Destroy/AccountDestroyService.php
View File

@@ -32,6 +32,7 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Facades\DB;
use stdClass;
/**
* Class AccountDestroyService
@@ -119,7 +120,7 @@ class AccountDestroyService
$service = app(JournalDestroyService::class);
$user = $account->user;
/** @var \stdClass $row */
/** @var stdClass $row */
foreach ($collection as $row) {
if ((int) $row->the_count > 1) {
$journalId = $row->transaction_journal_id;

5
app/Services/Internal/Update/CategoryUpdateService.php
View File

@@ -30,6 +30,7 @@ use FireflyIII\Models\RecurrenceTransactionMeta;
use FireflyIII\Models\RuleAction;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\User;
use Exception;
/**
* Class CategoryUpdateService
@@ -59,7 +60,7 @@ class CategoryUpdateService
}
/**
* @throws \Exception
* @throws Exception
*/
public function update(Category $category, array $data): Category
{
@@ -128,7 +129,7 @@ class CategoryUpdateService
}
/**
* @throws \Exception
* @throws Exception
*/
private function updateNotes(Category $category, array $data): void
{

3
app/Services/Webhook/StandardWebhookSender.php
View File

@@ -32,6 +32,7 @@ use GuzzleHttp\Client;
use GuzzleHttp\Exception\ConnectException;
use GuzzleHttp\Exception\GuzzleException;
use GuzzleHttp\Exception\RequestException;
use JsonException;
/**
* Class StandardWebhookSender
@@ -81,7 +82,7 @@ class StandardWebhookSender implements WebhookSenderInterface
try {
$json = \Safe\json_encode($this->message->message, JSON_THROW_ON_ERROR);
} catch (\JsonException $e) {
} catch (JsonException $e) {
app('log')->error('Did not send message because of a JSON error.');
app('log')->error($e->getMessage());
app('log')->error($e->getTraceAsString());