From d9ca7b727740a1aa896df50ea0be61fb3a626552 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 13 May 2018 09:39:06 +0200
Subject: [PATCH] Better error messages [skip ci]

---
 app/Http/Controllers/Import/IndexController.php         | 2 +-
 app/Http/Controllers/Import/PrerequisitesController.php | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Import/IndexController.php b/app/Http/Controllers/Import/IndexController.php
index 726e1a54bc..2149dc65ff 100644
--- a/app/Http/Controllers/Import/IndexController.php
+++ b/app/Http/Controllers/Import/IndexController.php
@@ -73,7 +73,7 @@ class IndexController extends Controller
     {
         // can only create "fake" for demo user.
         $providers = array_keys($this->getProviders());
-        if (!in_array($importProvider, $providers, true)) {
+        if (!\in_array($importProvider, $providers, true)) {
             session()->flash('warning', trans('import.cannot_create_for_provider', ['provider' => $importProvider]));
 
             return redirect(route('import.index'));
diff --git a/app/Http/Controllers/Import/PrerequisitesController.php b/app/Http/Controllers/Import/PrerequisitesController.php
index b8bdebbd52..b576e5780c 100644
--- a/app/Http/Controllers/Import/PrerequisitesController.php
+++ b/app/Http/Controllers/Import/PrerequisitesController.php
@@ -24,7 +24,6 @@ namespace FireflyIII\Http\Controllers\Import;
 
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Http\Middleware\IsDemoUser;
 use FireflyIII\Import\Prerequisites\PrerequisitesInterface;
 use FireflyIII\Models\ImportJob;
 use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
@@ -75,7 +74,7 @@ class PrerequisitesController extends Controller
         // catch impossible status:
         $allowed = ['new'];
         if (null !== $importJob && !in_array($importJob->status, $allowed)) {
-            Log::error('Job is not new but wants to do prerequisites');
+            Log::error(sprintf('Job has state "%s" but this Prerequisites::index() only accepts %s', $importJob->status, json_encode($allowed)));
             session()->flash('error', trans('import.bad_job_status', ['status' => $importJob->status]));
 
             return redirect(route('import.index'));
@@ -128,8 +127,8 @@ class PrerequisitesController extends Controller
 
         // catch impossible status:
         $allowed = ['new'];
-        if (null !== $importJob && !in_array($importJob->status, $allowed)) {
-            Log::error('Job is not new but wants to do prerequisites');
+        if (null !== $importJob && !\in_array($importJob->status, $allowed, true)) {
+            Log::error(sprintf('Job has state "%s" but this Prerequisites::post() only accepts %s', $importJob->status, json_encode($allowed)));
             session()->flash('error', trans('import.bad_job_status', ['status' => $importJob->status]));
 
             return redirect(route('import.index'));
@@ -145,7 +144,7 @@ class PrerequisitesController extends Controller
         $object->setUser(auth()->user());
         Log::debug('Going to store entered prerequisites.');
         // store post data
-        $data = $request->all();
+        $data   = $request->all();
         $result = $object->storePrerequisites($data);
         Log::debug(sprintf('Result of storePrerequisites has message count: %d', $result->count()));