Various code cleanup

app/Support/Import/Configuration/ConfigurationInterface.php

@@ -27,6 +27,13 @@ interface ConfigurationInterface
      */
     public function getData(): array;
 
+    /**
+     * Return possible warning to user.
+     *
+     * @return string
+     */
+    public function getWarningMessage(): string;
+
     /**
      * @param ImportJob $job
      *
@@ -43,11 +50,4 @@ interface ConfigurationInterface
      */
     public function storeConfiguration(array $data): bool;
 
-    /**
-     * Return possible warning to user.
-     *
-     * @return string
-     */
-    public function getWarningMessage(): string;
-
 }

app/Support/Import/Configuration/Csv/Initial.php

@@ -61,6 +61,16 @@ class Initial implements ConfigurationInterface
         return $data;
     }
 
+    /**
+     * Return possible warning to user.
+     *
+     * @return string
+     */
+    public function getWarningMessage(): string
+    {
+        return '';
+    }
+
     /**
      * @param ImportJob $job
      *
@@ -135,14 +145,4 @@ class Initial implements ConfigurationInterface
 
         return $config;
     }
-
-    /**
-     * Return possible warning to user.
-     *
-     * @return string
-     */
-    public function getWarningMessage(): string
-    {
-        return '';
-    }
 }

app/Support/Import/Configuration/Csv/Map.php

@@ -106,6 +106,16 @@ class Map implements ConfigurationInterface
 
     }
 
+    /**
+     * Return possible warning to user.
+     *
+     * @return string
+     */
+    public function getWarningMessage(): string
+    {
+        return '';
+    }
+
     /**
      * @param ImportJob $job
      *
@@ -268,14 +278,4 @@ class Map implements ConfigurationInterface
 
         return $column;
     }
-
-    /**
-     * Return possible warning to user.
-     *
-     * @return string
-     */
-    public function getWarningMessage(): string
-    {
-        return '';
-    }
 }

app/Support/Import/Configuration/Csv/Roles.php

@@ -262,7 +262,7 @@ class Roles implements ConfigurationInterface
             $this->warning = '';
         }
         if ($assigned === 0 || !$hasAmount) {
-            $this->warning = trans('csv.roles_warning');
+            $this->warning = strval(trans('csv.roles_warning'));
         }
 
         return true;

app/Support/Import/Prerequisites/PrerequisitesInterface.php

@@ -16,13 +16,6 @@ use FireflyIII\User;
 
 interface PrerequisitesInterface
 {
-    /**
-     * Set the user for this Prerequisites-routine. Class is expected to implement and save this.
-     *
-     * @param User $user
-     */
-    public function setUser(User $user): void;
-
     /**
      * Returns view name that allows user to fill in prerequisites.
      *
@@ -44,4 +37,11 @@ interface PrerequisitesInterface
      * @return bool
      */
     public function hasPrerequisites(): bool;
+
+    /**
+     * Set the user for this Prerequisites-routine. Class is expected to implement and save this.
+     *
+     * @param User $user
+     */
+    public function setUser(User $user): void;
 }