Revert "Fix redirect issue."

This reverts commit 6b2ddbf.

Author: JC5

app/Http/Controllers/Import/CSV/RoleController.php

@@ -67,7 +67,7 @@ public function __construct()
      */
     public function index(Request $request)
     {
-        Log::debug('Now in role controller index');
+        Log::debug('Now in role controller');
         $flow = $request->cookie(Constants::FLOW_COOKIE);
         if ('csv' !== $flow) {
             die('redirect or something');
@@ -112,7 +112,6 @@ public function index(Request $request)
      */
     public function postIndex(RolesPostRequest $request): RedirectResponse
     {
-        Log::debug('Now in role controller postindex');
         $data = $request->getAll();
 
         // get configuration object.

app/Http/Controllers/Import/MapController.php

@@ -92,15 +92,8 @@ public function index()
 
         // if nothing to map, just set mappable to true and go to the next step:
         if (0 === count($data)) {
-            Log::debug('There is nothing to map, fast forward to conversion.');
             // set map config as complete.
             session()->put(Constants::MAPPING_COMPLETE_INDICATOR, true);
-
-            // if CSV, now ready for conversion
-            if ('csv' === $configuration->getFlow()) {
-                session()->put(Constants::READY_FOR_CONVERSION, true);
-            }
-
             return redirect()->route('007-convert.index');
         }
 
@@ -164,14 +157,12 @@ private function getCSVMapInformation(): array
 
         // get columns from file
         $content   = StorageService::getContent(session()->get(Constants::UPLOAD_CSV_FILE), $configuration->isConversion());
-        $delimiter = (string)config(sprintf('csv.delimiters.%s', $configuration->getDelimiter()));
-
+        $delimiter = (string) config(sprintf('csv.delimiters.%s', $configuration->getDelimiter()));
         return MapperService::getMapData($content, $delimiter, $configuration->isHeaders(), $configuration->getSpecifics(), $data);
     }
 
     /**
      * Weird bunch of code to return info on Spectre and Nordigen.
-     *
      * @return array
      * @throws ContainerExceptionInterface
      * @throws FileNotFoundException
@@ -232,7 +223,6 @@ private function getImporterMapInformation(): array
             $category['mapped']       = $existingMapping[$index] ?? [];
             $data[]                   = $category;
         }
-
         return $data;
     }
 
@@ -263,8 +253,8 @@ private function getOpposingAccounts(): array
             Log::debug(sprintf('[%s/%s] Parsing transaction', ($index + 1), $total));
             /** @var array $row */
             foreach ($transaction['transactions'] as $row) {
-                $opposing[] = (string)array_key_exists('destination_name', $row) ? $row['destination_name'] : '';
-                $opposing[] = (string)array_key_exists('source_name', $row) ? $row['source_name'] : '';
+                $opposing[] = (string) array_key_exists('destination_name', $row) ? $row['destination_name'] : '';
+                $opposing[] = (string) array_key_exists('source_name', $row) ? $row['source_name'] : '';
             }
 
         }
@@ -303,14 +293,14 @@ private function getCategories(): array
             Log::debug(sprintf('[%s/%s] Parsing transaction', ($index + 1), $total));
             /** @var array $row */
             foreach ($transaction['transactions'] as $row) {
-                $categories[] = (string)array_key_exists('category_name', $row) ? $row['category_name'] : '';
+                $categories[] = (string) array_key_exists('category_name', $row) ? $row['category_name'] : '';
             }
 
         }
         $filtered = array_filter(
             $categories,
             static function (?string $value) {
-                return '' !== (string)$value;
+                return '' !== (string) $value;
             }
         );
 
@@ -351,7 +341,7 @@ public function postIndex(Request $request): RedirectResponse
             foreach ($column as $valueIndex => $value) {
                 $mappedValue = $mapping[$columnIndex][$valueIndex] ?? null;
                 if (null !== $mappedValue && 0 !== $mappedValue && '0' !== $mappedValue) {
-                    $data[$columnIndex][$value] = (int)$mappedValue;
+                    $data[$columnIndex][$value] = (int) $mappedValue;
                 }
 
             }
@@ -400,14 +390,12 @@ public function postIndex(Request $request): RedirectResponse
             // if nordigen, now ready for submission!
             session()->put(Constants::READY_FOR_SUBMISSION, true);
         }
-
         return redirect()->route('007-convert.index');
     }
 
     /**
      * @param array $original
      * @param array $new
-     *
      * @return array
      */
     private function mergeMapping(array $original, array $new): array
@@ -426,7 +414,6 @@ private function mergeMapping(array $original, array $new): array
                 $original[$column] = $mappedValues;
             }
         }
-
         // original has been updated:
         return $original;
     }

app/Services/Shared/Configuration/Configuration.php

@@ -343,14 +343,14 @@ private static function fromClassicFile(array $data): self
         // loop do mapping from classic file.
         $doMapping = $data['column-do-mapping'] ?? [];
         foreach ($doMapping as $index => $map) {
-            $index                     = (int)$index;
+            $index                     = (int) $index;
             $object->doMapping[$index] = $map;
         }
 
         // loop mapping from classic file.
         $mapping = $data['column-mapping-config'] ?? [];
         foreach ($mapping as $index => $map) {
-            $index                   = (int)$index;
+            $index                   = (int) $index;
             $object->mapping[$index] = $map;
         }
         // set version to "2" and return.
@@ -452,7 +452,6 @@ private static function fromVersionThree(array $data): self
     {
         $object            = self::fromArray($data);
         $object->specifics = [];
-
         return $object;
     }
 
@@ -516,14 +515,12 @@ public function isIgnoreDuplicateTransactions(): bool
 
     /**
      * Return the array but drop some potentially massive arrays.
-     *
      * @return array
      */
     public function toSessionArray(): array
     {
         $array = $this->toArray();
         unset($array['mapping'], $array['do_mapping'], $array['roles']);
-
         return $array;
     }
 
@@ -549,7 +546,6 @@ public function toArray(): array
             'unique_column_index'           => $this->uniqueColumnIndex,
             'unique_column_type'            => $this->uniqueColumnType,
             'version'                       => $this->version,
-            'importer_version'              => sprintf('data-importer-%s', config('importer.version')),
             'flow'                          => $this->flow,
 
             // spectre
@@ -813,7 +809,6 @@ public function addRequisition(string $key, string $identifier)
 
     /**
      * @param string $key
-     *
      * @return string|null
      */
     public function getRequisition(string $key): ?string