firefly-iii / csv-importer

app/Console/Commands/AutoImport.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
             return 1;
         }
 
-        $this->directory = (string) ($this->argument('directory') ?? './');
+        $this->directory = (string)($this->argument('directory') ?? './');
         $this->line(sprintf('Going to automatically import everything found in %s', $this->directory));
 
         $files = $this->getFiles();

app/Services/Import/Task/Amount.php

Spacing +7 added lines, -7 removed lines

@@ -73,33 +73,33 @@
     {
         Log::debug(sprintf('Now at the start of processAmount("%s")', $transaction['amount']));
         $amount = null;
-        if (null === $amount && $this->validAmount((string) $transaction['amount'])) {
+        if (null === $amount && $this->validAmount((string)$transaction['amount'])) {
             Log::debug('Transaction["amount"] value is not NULL, assume this is the correct value.');
             $amount = $transaction['amount'];
         }
 
-        if (null === $amount && $this->validAmount((string) $transaction['amount_debit'])) {
+        if (null === $amount && $this->validAmount((string)$transaction['amount_debit'])) {
             Log::debug(sprintf('Transaction["amount_debit"] value is not NULL ("%s"), assume this is the correct value.', $transaction['amount_debit']));
             $amount = $transaction['amount_debit'];
         }
 
-        if (null === $amount && $this->validAmount((string) $transaction['amount_credit'])) {
+        if (null === $amount && $this->validAmount((string)$transaction['amount_credit'])) {
             Log::debug(sprintf('Transaction["amount_credit"] value is not NULL ("%s"), assume this is the correct value.', $transaction['amount_credit']));
             $amount = $transaction['amount_credit'];
         }
 
-        if (null === $amount && $this->validAmount((string) $transaction['amount_negated'])) {
+        if (null === $amount && $this->validAmount((string)$transaction['amount_negated'])) {
             Log::debug(sprintf('Transaction["amount_negated"] value is not NULL ("%s"), assume this is the correct value.', $transaction['amount_negated']));
             $amount = $transaction['amount_negated'];
         }
 
         if (array_key_exists('amount_modifier', $transaction)) {
-            $transaction['amount_modifier'] = (string) $transaction['amount_modifier'];
+            $transaction['amount_modifier'] = (string)$transaction['amount_modifier'];
         }
         if (array_key_exists('foreign_amount', $transaction)) {
-            $transaction['foreign_amount'] = (string) $transaction['foreign_amount'];
+            $transaction['foreign_amount'] = (string)$transaction['foreign_amount'];
         }
-        $amount = (string) $amount;
+        $amount = (string)$amount;
         if ('' === $amount) {
             Log::error('Amount is EMPTY. This will give problems further ahead.', $transaction);
 

app/Mail/ImportFinished.php

Spacing +2 added lines, -2 removed lines

@@ -41,8 +41,8 @@
      */
     public function build()
     {
-        $address = (string) config('mail.from.address');
-        $name    = (string) config('mail.from.name');
+        $address = (string)config('mail.from.address');
+        $name    = (string)config('mail.from.name');
 
         return $this->from($address, $name)->markdown('emails.import.finished');
     }

app/Services/Import/Task/EmptyAccounts.php

Spacing +3 added lines, -3 removed lines

@@ -118,16 +118,16 @@
 
         if ('withdrawal' === $transaction['type']) {
             $destName = $transaction['destination_name'] ?? '';
-            $destId   = (int) ($transaction['destination_id'] ?? 0);
+            $destId   = (int)($transaction['destination_id'] ?? 0);
             $destIban = $transaction['destination_iban'] ?? '';
-            if ('' === $destName && 0 === $destId && ''=== $destIban) {
+            if ('' === $destName && 0 === $destId && '' === $destIban) {
                 Log::debug('Destination name + ID + IBAN of withdrawal are empty, set to "(no name)".');
                 $transaction['destination_name'] = '(no name)';
             }
         }
         if ('deposit' === $transaction['type']) {
             $sourceName = $transaction['source_name'] ?? '';
-            $sourceId   = (int) ($transaction['source_id'] ?? 0);
+            $sourceId   = (int)($transaction['source_id'] ?? 0);
             $sourceIban = $transaction['source_iban'] ?? '';
             if ('' === $sourceName && 0 === $sourceId && '' === $sourceIban) {
                 Log::debug('Source name + IBAN + ID of deposit are empty, set to "(no name)".');

app/Services/Import/ImportJobStatus/ImportJobStatusManager.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
                 try {
                     $array  = json_decode($disk->get($identifier), true, 512, JSON_THROW_ON_ERROR);
                     $status = ImportJobStatus::fromArray($array);
-                } catch (FileNotFoundException|JsonException $e) {
+                } catch (FileNotFoundException | JsonException $e) {
                     Log::error($e->getMessage());
                     $status = new ImportJobStatus;
                 }

app/Services/CSV/Specifics/IngDescription.php

Spacing +9 added lines, -9 removed lines

@@ -81,12 +81,12 @@ 
                 case 'VZ':                               // Verzamelbetaling
                 case 'IC':                               // Incasso
                 case 'DV':                               // Divers
-                    $this->removeIBANIngDescription();   // Remove "IBAN:", because it is already at "Tegenrekening"
-                    $this->removeNameIngDescription();   // Remove "Naam:", because it is already at "Naam/ Omschrijving"
-                    $this->removeIngDescription();       // Remove "Omschrijving", but not the value from description
+                    $this->removeIBANIngDescription(); // Remove "IBAN:", because it is already at "Tegenrekening"
+                    $this->removeNameIngDescription(); // Remove "Naam:", because it is already at "Naam/ Omschrijving"
+                    $this->removeIngDescription(); // Remove "Omschrijving", but not the value from description
                     $this->moveValutadatumDescription(); // Move "Valutadatum" from description to new column
-                    $this->MoveSavingsAccount();         // Move savings account number and name
-                    $this->moveDatumTijdValue();         // Move datum + tijd
+                    $this->MoveSavingsAccount(); // Move savings account number and name
+                    $this->moveDatumTijdValue(); // Move datum + tijd
                     break;
                 case 'BA':                              // Betaalautomaat
                     $this->moveValutadatumDescription(); // Move "Valutadatum" from description to new column
@@ -171,19 +171,19 @@ 
 
         if (preg_match('/(Naar|Van) (.*rekening) ([A-Za-z0-9]+)/', $this->row[8], $matches)) { // Search for saving acount at 'Mededelingen' column
             $this->row[1] .= ' ' . $matches[2] . ' ' . $matches[3]; // Current name + Saving acount name + Acount number
-            if ('' === (string) $this->row[3]) { // if Saving account number does not yet exists
+            if ('' === (string)$this->row[3]) { // if Saving account number does not yet exists
                 $this->row[3] = $matches[3]; // Copy savings account number
             }
             $this->row[8] = preg_replace('/(Naar|Van) (.*rekening) ([A-Za-z0-9]+)/', '', $this->row[8]); // Remove the savings account content from description
         } elseif (preg_match('/(Naar|Van) (.*rekening) ([A-Za-z0-9]+)/', $this->row[1], $matches)) { // Search for saving acount at 'Naam / Omschrijving' column
-            $this->row[1] = $matches[2] . ' ' . $matches[3];  // Saving acount name + Acount number
-            if ('' === (string) $this->row[3]) { // if Saving account number does not yet exists
+            $this->row[1] = $matches[2] . ' ' . $matches[3]; // Saving acount name + Acount number
+            if ('' === (string)$this->row[3]) { // if Saving account number does not yet exists
                 $this->row[3] = $matches[3]; // Copy savings account number
             }
         }
 
         // if Saving account number exists
-        if (('' !== (string) $this->row[3]) && !preg_match('/[A-Za-z]/', $this->row[3])) { // if Saving account number has no characters
+        if (('' !== (string)$this->row[3]) && !preg_match('/[A-Za-z]/', $this->row[3])) { // if Saving account number has no characters
             $this->row[3] = sprintf('%010d', $this->row[3]); // Make the number 10 digits
         }
     }

app/Services/CSV/Converter/Date.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
             Log::debug(sprintf('Date converter is going to work on "%s" using format "%s"', $string, $this->dateFormat));
             try {
                 $carbon = Carbon::createFromFormat($this->dateFormat, $string);
-            } catch (InvalidArgumentException|Exception $e) {
+            } catch (InvalidArgumentException | Exception $e) {
                 Log::error(sprintf('%s converting the date: %s', get_class($e), $e->getMessage()));
 
                 return Carbon::today()->startOfDay()->format('Y-m-d H:i:s');

app/Services/Import/Task/Accounts.php

Spacing +13 added lines, -13 removed lines

@@ -97,7 +97,7 @@ 
         // if the ID is set, at least search for the ID.
         if (is_int($array['id']) && $array['id'] > 0) {
             Log::debug('Find by ID field.');
-            $result = $this->findById((string) $array['id']);
+            $result = $this->findById((string)$array['id']);
         }
         if (null !== $result) {
             $return = $result->toArray();
@@ -107,10 +107,10 @@ 
         }
 
         // if the IBAN is set, search for the IBAN.
-        if (isset($array['iban']) && '' !== (string) $array['iban']) {
+        if (isset($array['iban']) && '' !== (string)$array['iban']) {
             Log::debug('Find by IBAN.');
-            $transactionType = (string) ($array['transaction_type'] ?? null);
-            $result          = $this->findByIban((string) $array['iban'], $transactionType);
+            $transactionType = (string)($array['transaction_type'] ?? null);
+            $result          = $this->findByIban((string)$array['iban'], $transactionType);
         }
         if (null !== $result) {
             $return = $result->toArray();
@@ -120,9 +120,9 @@ 
         }
 
         // find by name, return only if it's an asset or liability account.
-        if (isset($array['name']) && '' !== (string) $array['name']) {
+        if (isset($array['name']) && '' !== (string)$array['name']) {
             Log::debug('Find by name.');
-            $result = $this->findByName((string) $array['name']);
+            $result = $this->findByName((string)$array['name']);
         }
         if (null !== $result) {
             $return = $result->toArray();
@@ -199,8 +199,8 @@ 
     private function findById(string $value): ?Account
     {
         Log::debug(sprintf('Going to search account with ID "%s"', $value));
-        $uri     = (string) config('csv_importer.uri');
-        $token   = (string) config('csv_importer.access_token');
+        $uri     = (string)config('csv_importer.uri');
+        $token   = (string)config('csv_importer.access_token');
         $request = new GetSearchAccountRequest($uri, $token);
         $request->setField('id');
         $request->setQuery($value);
@@ -239,8 +239,8 @@ 
     private function findByIban(string $iban, string $transactionType): ?Account
     {
         Log::debug(sprintf('Going to search account with IBAN "%s"', $iban));
-        $uri     = (string) config('csv_importer.uri');
-        $token   = (string) config('csv_importer.access_token');
+        $uri     = (string)config('csv_importer.uri');
+        $token   = (string)config('csv_importer.access_token');
         $request = new GetSearchAccountRequest($uri, $token);
         $request->setField('iban');
         $request->setQuery($iban);
@@ -285,8 +285,8 @@ 
     private function findByName(string $name): ?Account
     {
         Log::debug(sprintf('Going to search account with name "%s"', $name));
-        $uri     = (string) config('csv_importer.uri');
-        $token   = (string) config('csv_importer.access_token');
+        $uri     = (string)config('csv_importer.uri');
+        $token   = (string)config('csv_importer.access_token');
         $request = new GetSearchAccountRequest($uri, $token);
         $request->setField('name');
         $request->setQuery($name);
@@ -381,7 +381,7 @@ 
         $transaction         = $this->setDestination($transaction, $destination);
         $transaction['type'] = $this->determineType($source['type'], $destination['type']);
 
-        $amount = (string) $transaction['amount'];
+        $amount = (string)$transaction['amount'];
         $amount = '' === $amount ? '0' : $amount;
 
         if ('0' === $amount) {

app/Services/Import/Routine/APISubmitter.php

Spacing +8 added lines, -8 removed lines

@@ -98,7 +98,7 @@ 
             return;
         }
 
-        $groupId = (int) $groupInfo['group_id'];
+        $groupId = (int)$groupInfo['group_id'];
         Log::debug(sprintf('Going to add import tag to transaction group #%d', $groupId));
         $body = [
             'transactions' => [],
@@ -114,8 +114,8 @@ 
                 'tags'                   => $currentTags,
             ];
         }
-        $uri     = (string) config('csv_importer.uri');
-        $token   = (string) config('csv_importer.access_token');
+        $uri     = (string)config('csv_importer.uri');
+        $token   = (string)config('csv_importer.access_token');
         $request = new PutTransactionRequest($uri, $token, $groupId);
         $request->setBody($body);
         $request->put();
@@ -168,8 +168,8 @@ 
 
             return;
         }
-        $uri     = (string) config('csv_importer.uri');
-        $token   = (string) config('csv_importer.access_token');
+        $uri     = (string)config('csv_importer.uri');
+        $token   = (string)config('csv_importer.access_token');
         $request = new PostTagRequest($uri, $token);
         $body    = [
             'tag'  => $this->tag,
@@ -204,8 +204,8 @@ 
     private function processTransaction(int $index, array $line): array
     {
         $return = [];
-        $uri      = (string) config('csv_importer.uri');
-        $token    = (string) config('csv_importer.access_token');
+        $uri      = (string)config('csv_importer.uri');
+        $token    = (string)config('csv_importer.access_token');
         $request  = new PostTransactionRequest($uri, $token);
         Log::debug('Submitting to Firefly III:', $line);
         $request->setBody($line);
@@ -281,7 +281,7 @@ 
     private function getOriginalValue(string $key, array $transaction): string
     {
         $parts = explode('.', $key);
-        if(1 === count($parts)) {
+        if (1 === count($parts)) {
             return $transaction[$key] ?? '(not found)';
         }
         if (3 !== count($parts)) {