From 0774258516e42533996c297cbb436fd89a70ce85 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 9 Dec 2017 12:08:24 +0100 Subject: [PATCH] Exceptions when class does not exist. --- app/Http/Controllers/Import/BankController.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Import/BankController.php b/app/Http/Controllers/Import/BankController.php index 9358481970..fe4e6790ce 100644 --- a/app/Http/Controllers/Import/BankController.php +++ b/app/Http/Controllers/Import/BankController.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Import; +use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Support\Import\Information\InformationInterface; use FireflyIII\Support\Import\Prerequisites\PrerequisitesInterface; @@ -43,6 +44,9 @@ class BankController extends Controller public function form(string $bank) { $class = config(sprintf('firefly.import_pre.%s', $bank)); + if(!class_exists($class)) { + throw new FireflyException(sprintf('Cannot find class %s', $class)); + } /** @var PrerequisitesInterface $object */ $object = app($class); $object->setUser(auth()->user()); @@ -72,6 +76,9 @@ class BankController extends Controller public function postForm(Request $request, string $bank) { $class = config(sprintf('firefly.import_pre.%s', $bank)); + if(!class_exists($class)) { + throw new FireflyException(sprintf('Cannot find class %s', $class)); + } /** @var PrerequisitesInterface $object */ $object = app($class); $object->setUser(auth()->user()); @@ -110,6 +117,9 @@ class BankController extends Controller { Log::debug(sprintf('Now in postPrerequisites for %s', $bank)); $class = config(sprintf('firefly.import_pre.%s', $bank)); + if(!class_exists($class)) { + throw new FireflyException(sprintf('Cannot find class %s', $class)); + } /** @var PrerequisitesInterface $object */ $object = app($class); $object->setUser(auth()->user()); @@ -142,13 +152,17 @@ class BankController extends Controller public function prerequisites(string $bank) { $class = config(sprintf('firefly.import_pre.%s', $bank)); + if(!class_exists($class)) { + throw new FireflyException(sprintf('Cannot find class %s', $class)); + } /** @var PrerequisitesInterface $object */ $object = app($class); $object->setUser(auth()->user()); if ($object->hasPrerequisites()) { $view = $object->getView(); - $parameters = $object->getViewParameters(); + $parameters = ['title' => strval(trans('firefly.import_index_title')),'mainTitleIcon' => 'fa-archive']; + $parameters = $object->getViewParameters() + $parameters; return view($view, $parameters); }