diff --git a/app/Console/Commands/CreateImport.php b/app/Console/Commands/CreateImport.php index 093ab03c3f..0bf65903fa 100644 --- a/app/Console/Commands/CreateImport.php +++ b/app/Console/Commands/CreateImport.php @@ -14,7 +14,6 @@ declare(strict_types = 1); namespace FireflyIII\Console\Commands; use Artisan; -use FireflyIII\Models\ImportJob; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Console\Command; diff --git a/app/Console/Commands/Import.php b/app/Console/Commands/Import.php index 8d7c23b0ac..0459e1c75b 100644 --- a/app/Console/Commands/Import.php +++ b/app/Console/Commands/Import.php @@ -62,6 +62,7 @@ class Import extends Command $job = ImportJob::whereKey($jobKey)->first(); if (!$this->isValid($job)) { Log::error('Job is not valid for some reason. Exit.'); + return; } diff --git a/app/Export/Processor.php b/app/Export/Processor.php index bfb7076006..7c33ae04b2 100644 --- a/app/Export/Processor.php +++ b/app/Export/Processor.php @@ -19,7 +19,6 @@ use FireflyIII\Export\Collector\UploadCollector; use FireflyIII\Export\Entry\Entry; use FireflyIII\Models\ExportJob; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Journal\JournalTaskerInterface; use Illuminate\Filesystem\FilesystemAdapter; use Illuminate\Support\Collection; @@ -97,7 +96,7 @@ class Processor public function collectJournals(): bool { /** @var JournalTaskerInterface $tasker */ - $tasker = app(JournalTaskerInterface::class); + $tasker = app(JournalTaskerInterface::class); $this->journals = $tasker->getJournalsInRange($this->accounts, $this->settings['startDate'], $this->settings['endDate']); return true; diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index fa7d003bb6..8afd02006f 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -205,6 +205,7 @@ class HomeController extends Controller Session::flash('info', 'This is an info message.'); Session::flash('warning', 'This is a warning.'); Session::flash('error', 'This is an error!'); + return redirect(route('home')); } diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 2c007aca1a..f35efcb180 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -55,7 +55,7 @@ class Transaction extends Model { protected $dates = ['created_at', 'updated_at', 'deleted_at']; - protected $fillable = ['account_id', 'transaction_journal_id', 'description', 'amount','identifier']; + protected $fillable = ['account_id', 'transaction_journal_id', 'description', 'amount', 'identifier']; protected $hidden = ['encrypted']; protected $rules = [ diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index a43f55186a..9c047824d8 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -267,7 +267,7 @@ class JournalRepository implements JournalRepositoryInterface $journal->description = $data['journal_description']; $journal->date = $data['date']; $journal->save(); - + // unlink all categories: $journal->categories()->detach(); $journal->budgets()->detach(); diff --git a/app/Repositories/User/UserRepositoryInterface.php b/app/Repositories/User/UserRepositoryInterface.php index a5fce26bad..1855fc1da1 100644 --- a/app/Repositories/User/UserRepositoryInterface.php +++ b/app/Repositories/User/UserRepositoryInterface.php @@ -31,22 +31,6 @@ interface UserRepositoryInterface */ public function all(): Collection; - /** - * @param int $userId - * - * @return User - */ - public function find(int $userId): User; - - /** - * Return basic user information. - * - * @param User $user - * - * @return array - */ - public function getUserData(User $user): array; - /** * Gives a user a role. * @@ -63,4 +47,20 @@ interface UserRepositoryInterface * @return int */ public function count(): int; + + /** + * @param int $userId + * + * @return User + */ + public function find(int $userId): User; + + /** + * Return basic user information. + * + * @param User $user + * + * @return array + */ + public function getUserData(User $user): array; } diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php index b2dfda8831..a13a62faab 100644 --- a/app/Support/Twig/General.php +++ b/app/Support/Twig/General.php @@ -16,7 +16,6 @@ namespace FireflyIII\Support\Twig; use Carbon\Carbon; use Config; use FireflyIII\Models\Account; -use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use Route; use Twig_Extension;