diff --git a/app/Console/Commands/Correction/DeleteEmptyJournals.php b/app/Console/Commands/Correction/DeleteEmptyJournals.php index 658bca87ff..f0105a3f60 100644 --- a/app/Console/Commands/Correction/DeleteEmptyJournals.php +++ b/app/Console/Commands/Correction/DeleteEmptyJournals.php @@ -28,6 +28,7 @@ use Exception; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use Illuminate\Console\Command; +use Illuminate\Database\QueryException; use Log; /** @@ -77,7 +78,7 @@ class DeleteEmptyJournals extends Command // uneven number, delete journal and transactions: try { TransactionJournal::find((int)$row->transaction_journal_id)->delete(); - } catch (Exception $e) { + } catch (QueryException $e) { Log::info(sprintf('Could not delete journal: %s', $e->getMessage())); } @@ -104,7 +105,7 @@ class DeleteEmptyJournals extends Command foreach ($set as $entry) { try { TransactionJournal::find($entry->id)->delete(); - } catch (Exception $e) { + } catch (QueryException $e) { Log::info(sprintf('Could not delete entry: %s', $e->getMessage())); } diff --git a/app/Console/Commands/Correction/DeleteOrphanedTransactions.php b/app/Console/Commands/Correction/DeleteOrphanedTransactions.php index 694a9c5f3f..3ddd7e1a7d 100644 --- a/app/Console/Commands/Correction/DeleteOrphanedTransactions.php +++ b/app/Console/Commands/Correction/DeleteOrphanedTransactions.php @@ -27,6 +27,7 @@ use Exception; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use Illuminate\Console\Command; +use Illuminate\Database\QueryException; use Log; use stdClass; @@ -147,7 +148,7 @@ class DeleteOrphanedTransactions extends Command if ($journal) { try { $journal->delete(); - } catch (Exception $e) { + } catch (QueryException $e) { Log::info(sprintf('Could not delete journal %s', $e->getMessage())); } } diff --git a/app/Console/Commands/Correction/DeleteZeroAmount.php b/app/Console/Commands/Correction/DeleteZeroAmount.php index 99331e67ad..d4eb88442e 100644 --- a/app/Console/Commands/Correction/DeleteZeroAmount.php +++ b/app/Console/Commands/Correction/DeleteZeroAmount.php @@ -27,6 +27,7 @@ use Exception; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use Illuminate\Console\Command; +use Illuminate\Database\QueryException; /** * Class DeleteZeroAmount @@ -62,7 +63,7 @@ class DeleteZeroAmount extends Command $this->info(sprintf('Deleted transaction journal #%d because the amount is zero (0.00).', $journal->id)); try { $journal->delete(); - } catch (Exception $e) { + } catch (QueryException $e) { $this->line($e->getMessage()); } diff --git a/app/Console/Commands/Upgrade/BackToJournals.php b/app/Console/Commands/Upgrade/BackToJournals.php index 31e862e035..397e6b1930 100644 --- a/app/Console/Commands/Upgrade/BackToJournals.php +++ b/app/Console/Commands/Upgrade/BackToJournals.php @@ -229,7 +229,7 @@ class BackToJournals extends Command foreach ($chunks as $chunk) { $set = DB::table('transactions') ->whereIn('transactions.id', $chunk) - ->get(['transaction_journal_id'])->pluck('transaction_journal_id')->toArray(); + ->pluck('transaction_journal_id')->toArray(); $array = array_merge($array, $set); } diff --git a/app/Console/Commands/Upgrade/MigrateJournalNotes.php b/app/Console/Commands/Upgrade/MigrateJournalNotes.php index 3477aa17f2..d994210d43 100644 --- a/app/Console/Commands/Upgrade/MigrateJournalNotes.php +++ b/app/Console/Commands/Upgrade/MigrateJournalNotes.php @@ -28,6 +28,7 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Note; use FireflyIII\Models\TransactionJournalMeta; use Illuminate\Console\Command; +use Illuminate\Database\QueryException; use Log; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; @@ -83,7 +84,7 @@ class MigrateJournalNotes extends Command Log::debug(sprintf('Migrated meta note #%d to Note #%d', $meta->id, $note->id)); try { $meta->delete(); - } catch (Exception $e) { + } catch (QueryException $e) { Log::error(sprintf('Could not delete old meta entry #%d: %s', $meta->id, $e->getMessage())); }