From 6bdb6db330966439a90d2fb03ca0efba0b61cec0 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 6 Jul 2015 16:42:19 +0200
Subject: [PATCH] Fixed some problems.

---
 app/Helpers/Csv/Importer.php           | 6 +++---
 app/Http/Controllers/CsvController.php | 1 -
 app/Support/ExpandedForm.php           | 1 -
 app/Validation/FireflyValidator.php    | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/Helpers/Csv/Importer.php b/app/Helpers/Csv/Importer.php
index 3c6ded585d..fa23c6f327 100644
--- a/app/Helpers/Csv/Importer.php
+++ b/app/Helpers/Csv/Importer.php
@@ -126,9 +126,8 @@ class Importer
 
         }
         // post processing and validating.
-        $data    = $this->postProcess($data, $row);
-        $result  = $this->validateData($data);
-        $journal = null;
+        $data   = $this->postProcess($data, $row);
+        $result = $this->validateData($data);
         if ($result === true) {
             $journal = $this->createTransactionJournal($data);
         } else {
@@ -274,6 +273,7 @@ class Importer
             $journal->save();
         } else {
             $text = join(',', $errors->all());
+
             return $text;
         }
 
diff --git a/app/Http/Controllers/CsvController.php b/app/Http/Controllers/CsvController.php
index fb77c50924..5d0a7cffe7 100644
--- a/app/Http/Controllers/CsvController.php
+++ b/app/Http/Controllers/CsvController.php
@@ -106,7 +106,6 @@ class CsvController extends Controller
             'date-format' => Session::get('date-format'),
             'has-headers' => Session::get('csv-has-headers')
         ];
-        //        $fields = ['csv-file', 'csv-date-format', 'csv-has-headers', 'csv-map', 'csv-roles', 'csv-mapped'];
         if (Session::has('csv-map')) {
             $data['map'] = Session::get('csv-map');
         }
diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php
index 62505adac6..37baf3dab0 100644
--- a/app/Support/ExpandedForm.php
+++ b/app/Support/ExpandedForm.php
@@ -349,7 +349,6 @@ class ExpandedForm
 
     /**
      * @param       $name
-     * @param null  $value
      * @param array $options
      *
      * @return string
diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php
index 6c177af69d..4d87ad39b8 100644
--- a/app/Validation/FireflyValidator.php
+++ b/app/Validation/FireflyValidator.php
@@ -59,7 +59,7 @@ class FireflyValidator extends Validator
      * @param $value
      * @param $parameters
      */
-    public function validateIban($attribute, $value, $parameters)
+    public function validateIban($attribute, $value)
     {
 
         $value = strtoupper($value);