firefly-iii / firefly-iii

app/Console/Commands/Export/ExportData.php

Spacing +2 added lines, -2 removed lines

@@ -177,7 +177,7 @@ 
         $accounts    = new Collection;
         $accountList = $this->option('accounts');
         $types       = [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE];
-        if (null !== $accountList && '' !== (string) $accountList) {
+        if (null !== $accountList && '' !== (string)$accountList) {
             $accountIds = explode(',', $accountList);
             $accounts   = $this->accountRepository->getAccountsById($accountIds);
         }
@@ -243,7 +243,7 @@ 
      */
     private function getExportDirectory(): string
     {
-        $directory = (string) $this->option('export_directory');
+        $directory = (string)$this->option('export_directory');
         if (null === $directory) {
             $directory = './';
         }

app/Console/Commands/DecryptDatabase.php

Spacing +3 added lines, -3 removed lines

@@ -95,13 +95,13 @@ 
                         // try to json_decrypt the value.
                         try {
                             $value = json_decode($value, true, 512, JSON_THROW_ON_ERROR) ?? $value;
-                        } catch(JsonException $e) {
+                        } catch (JsonException $e) {
                             Log::error($e->getMessage());
                         }
                         Log::debug(sprintf('Decrypted field "%s" "%s" to "%s" in table "%s" (row #%d)', $field, $original, print_r($value, true), $table, $id));
 
                         /** @var Preference $object */
-                        $object = Preference::find((int) $id);
+                        $object = Preference::find((int)$id);
                         if (null !== $object) {
                             $object->data = $value;
                             $object->save();
@@ -137,7 +137,7 @@ 
         $configName = sprintf('is_decrypted_%s', $table);
         $configVar  = app('fireflyconfig')->get($configName, false);
         if (null !== $configVar) {
-            return (bool) $configVar->data;
+            return (bool)$configVar->data;
         }
 
         return false;

app/Import/Specifics/IngDescription.php

Spacing +8 added lines, -8 removed lines

@@ -81,11 +81,11 @@ 
                 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->MoveSavingsAccount(); // Move savings account number and name
                     break;
                 case 'BA':                              // Betaalautomaat
                     $this->moveValutadatumDescription(); // Move "Valutadatum" from description to new column
@@ -153,19 +153,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] = $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 ('' !== (string)$this->row[3]) { // if Saving account number exists
-            if (! preg_match('/[A-Za-z]/', $this->row[3])) { // if Saving account number has no characters 
+            if (!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/Support/Amount.php

Spacing +2 added lines, -2 removed lines

@@ -283,7 +283,7 @@ 
 
         // at this point the currency preference could be encrypted, if coming from an old version.
         Log::debug('Going to try to decrypt users currency preference.');
-        $currencyCode = $this->tryDecrypt((string) $currencyPrefStr);
+        $currencyCode = $this->tryDecrypt((string)$currencyPrefStr);
 
         // could still be json encoded:
         if (strlen($currencyCode) > 3) {
@@ -325,7 +325,7 @@ 
      */
     public function getLocaleInfo(): array
     {
-        $locale = explode(',', (string) trans('config.locale'));
+        $locale = explode(',', (string)trans('config.locale'));
         $locale = array_map('trim', $locale);
         setlocale(LC_MONETARY, $locale);
         $info = localeconv();

app/Http/Controllers/Transaction/ConvertController.php

Spacing +14 added lines, -14 removed lines

@@ -68,10 +68,10 @@ 
 
         // some useful repositories:
         $this->middleware(
-            function ($request, $next) {
+            function($request, $next) {
                 $this->repository = app(JournalRepositoryInterface::class);
 
-                app('view')->share('title', (string) trans('firefly.transactions'));
+                app('view')->share('title', (string)trans('firefly.transactions'));
                 app('view')->share('mainTitleIcon', 'fa-exchange');
 
                 return $next($request);
@@ -105,7 +105,7 @@ 
 
         $groupTitle   = $group->title ?? $first->description;
         $groupArray   = $transformer->transformObject($group);
-        $subTitle     = (string) trans('firefly.convert_to_' . $destinationType->type, ['description' => $groupTitle]);
+        $subTitle     = (string)trans('firefly.convert_to_' . $destinationType->type, ['description' => $groupTitle]);
         $subTitleIcon = 'fa-exchange';
 
         // get a list of asset accounts and liabilities and stuff, in various combinations:
@@ -121,7 +121,7 @@ 
 
         if ($sourceType->type === $destinationType->type) { // cannot convert to its own type.
             Log::debug('This is already a transaction of the expected type..');
-            session()->flash('info', (string) trans('firefly.convert_is_already_type_' . $destinationType->type));
+            session()->flash('info', (string)trans('firefly.convert_is_already_type_' . $destinationType->type));
 
             return redirect(route('transactions.show', [$group->id]));
         }
@@ -178,7 +178,7 @@ 
         $group->refresh();
         $this->correctTransfer($group);
 
-        session()->flash('success', (string) trans('firefly.converted_to_' . $destinationType->type));
+        session()->flash('success', (string)trans('firefly.converted_to_' . $destinationType->type));
         event(new UpdatedTransactionGroup($group));
 
         return redirect(route('transactions.show', [$group->id]));
@@ -205,9 +205,9 @@ 
         $destinationName = $data['destination_name'][$journal->id] ?? null;
 
         // double check its not an empty string.
-        $sourceId         = '' === $sourceId || null === $sourceId ? null : (int) $sourceId;
+        $sourceId         = '' === $sourceId || null === $sourceId ? null : (int)$sourceId;
         $sourceName       = '' === $sourceName ? null : $sourceName;
-        $destinationId    = '' === $destinationId || null === $destinationId ? null : (int) $destinationId;
+        $destinationId    = '' === $destinationId || null === $destinationId ? null : (int)$destinationId;
         $destinationName  = (string)('' === $destinationName ? null : $destinationName);
         $validSource      = $validator->validateSource($sourceId, $sourceName, null);
         $validDestination = $validator->validateDestination($destinationId, $destinationName, null);
@@ -262,12 +262,12 @@ 
         foreach ($accountList as $account) {
             $balance  = app('steam')->balance($account, new Carbon);
             $currency = $repository->getAccountCurrency($account) ?? $defaultCurrency;
-            $role     = (string) $repository->getMetaValue($account, 'account_role');
+            $role     = (string)$repository->getMetaValue($account, 'account_role');
             if ('' === $role) {
                 $role = 'no_account_type'; // @codeCoverageIgnore
             }
 
-            $key                         = (string) trans('firefly.opt_group_' . $role);
+            $key                         = (string)trans('firefly.opt_group_' . $role);
             $grouped[$key][$account->id] = $account->name . ' (' . app('amount')->formatAnything($currency, $balance, false) . ')';
         }
 
@@ -292,7 +292,7 @@ 
             $balance                     = app('steam')->balance($account, new Carbon);
             $currency                    = $repository->getAccountCurrency($account) ?? $defaultCurrency;
             $role                        = 'l_' . $account->accountType->type;
-            $key                         = (string) trans('firefly.opt_group_' . $role);
+            $key                         = (string)trans('firefly.opt_group_' . $role);
             $grouped[$key][$account->id] = $account->name . ' (' . app('amount')->formatAnything($currency, $balance, false) . ')';
         }
 
@@ -314,7 +314,7 @@ 
         // group accounts:
         /** @var Account $account */
         foreach ($accountList as $account) {
-            $role = (string) $repository->getMetaValue($account, 'account_role');
+            $role = (string)$repository->getMetaValue($account, 'account_role');
             $name = $account->name;
             if ('' === $role) {
                 $role = 'no_account_type'; // @codeCoverageIgnore
@@ -334,7 +334,7 @@ 
                 $role = 'revenue_account'; // @codeCoverageIgnore
             }
 
-            $key                         = (string) trans('firefly.opt_group_' . $role);
+            $key                         = (string)trans('firefly.opt_group_' . $role);
             $grouped[$key][$account->id] = $name;
         }
 
@@ -356,7 +356,7 @@ 
         // group accounts:
         /** @var Account $account */
         foreach ($accountList as $account) {
-            $role = (string) $repository->getMetaValue($account, 'account_role');
+            $role = (string)$repository->getMetaValue($account, 'account_role');
             $name = $account->name;
             if ('' === $role) {
                 $role = 'no_account_type'; // @codeCoverageIgnore
@@ -376,7 +376,7 @@ 
                 $role = 'expense_account'; // @codeCoverageIgnore
             }
 
-            $key                         = (string) trans('firefly.opt_group_' . $role);
+            $key                         = (string)trans('firefly.opt_group_' . $role);
             $grouped[$key][$account->id] = $name;
         }
 

app/Http/Requests/RecurrenceFormRequest.php

Spacing +9 added lines, -9 removed lines

@@ -252,16 +252,16 @@ 
             default:
                 throw new FireflyException(sprintf('Cannot handle transaction type "%s"', $this->string('transaction_type'))); // @codeCoverageIgnore
             case 'withdrawal':
-                $sourceId      = (int) $data['source_id'];
-                $destinationId = (int) $data['withdrawal_destination_id'];
+                $sourceId      = (int)$data['source_id'];
+                $destinationId = (int)$data['withdrawal_destination_id'];
                 break;
             case 'deposit':
-                $sourceId      = (int) $data['deposit_source_id'];
-                $destinationId = (int) $data['destination_id'];
+                $sourceId      = (int)$data['deposit_source_id'];
+                $destinationId = (int)$data['destination_id'];
                 break;
             case 'transfer':
-                $sourceId      = (int) $data['source_id'];
-                $destinationId = (int) $data['destination_id'];
+                $sourceId      = (int)$data['source_id'];
+                $destinationId = (int)$data['destination_id'];
                 break;
         }
 
@@ -271,7 +271,7 @@ 
 
         // do something with result:
         if (false === $validSource) {
-            $message = (string) trans('validation.generic_invalid_source');
+            $message = (string)trans('validation.generic_invalid_source');
             $validator->errors()->add('source_id', $message);
             $validator->errors()->add('deposit_source_id', $message);
 
@@ -282,7 +282,7 @@ 
         $validDestination = $accountValidator->validateDestination($destinationId, null, null);
         // do something with result:
         if (false === $validDestination) {
-            $message = (string) trans('validation.generic_invalid_destination');
+            $message = (string)trans('validation.generic_invalid_destination');
             $validator->errors()->add('destination_id', $message);
             $validator->errors()->add('withdrawal_destination_id', $message);
 
@@ -300,7 +300,7 @@ 
     public function withValidator(Validator $validator): void
     {
         $validator->after(
-            function (Validator $validator) {
+            function(Validator $validator) {
                 // validate all account info
                 $this->validateAccountInformation($validator);
             }

app/Validation/TransactionValidation.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
         $accountValidator->setTransactionType($transactionType);
 
         // validate source account.
-        $sourceId    = isset($transaction['source_id']) ? (int) $transaction['source_id'] : null;
+        $sourceId    = isset($transaction['source_id']) ? (int)$transaction['source_id'] : null;
         $sourceName  = $transaction['source_name'] ?? null;
         $sourceIban  = $transaction['source_iban'] ?? null;
         $validSource = $accountValidator->validateSource($sourceId, $sourceName, $sourceIban);
@@ -85,7 +85,7 @@ 
             return;
         }
         // validate destination account
-        $destinationId    = isset($transaction['destination_id']) ? (int) $transaction['destination_id'] : null;
+        $destinationId    = isset($transaction['destination_id']) ? (int)$transaction['destination_id'] : null;
         $destinationName  = $transaction['destination_name'] ?? null;
         $destinationIban  = $transaction['destination_iban'] ?? null;
         $validDestination = $accountValidator->validateDestination($destinationId, $destinationName, $destinationIban);

app/Factory/TransactionJournalFactory.php

Spacing +12 added lines, -12 removed lines

@@ -210,7 +210,7 @@ 
         $set = [
             'journal' => $journal,
             'name'    => $field,
-            'data'    => (string) ($data[$field] ?? ''),
+            'data'    => (string)($data[$field] ?? ''),
         ];
 
         Log::debug(sprintf('Going to store meta-field "%s", with value "%s".', $set['name'], $set['data']));
@@ -257,11 +257,11 @@ 
         $type            = $this->typeRepository->findTransactionType(null, $row['type']);
         $carbon          = $row['date'] ?? new Carbon;
         $order           = $row['order'] ?? 0;
-        $currency        = $this->currencyRepository->findCurrency((int) $row['currency_id'], $row['currency_code']);
+        $currency        = $this->currencyRepository->findCurrency((int)$row['currency_id'], $row['currency_code']);
         $foreignCurrency = $this->currencyRepository->findCurrencyNull($row['foreign_currency_id'], $row['foreign_currency_code']);
-        $bill            = $this->billRepository->findBill((int) $row['bill_id'], $row['bill_name']);
+        $bill            = $this->billRepository->findBill((int)$row['bill_id'], $row['bill_name']);
         $billId          = TransactionType::WITHDRAWAL === $type->type && null !== $bill ? $bill->id : null;
-        $description     = app('steam')->cleanString((string) $row['description']);
+        $description     = app('steam')->cleanString((string)$row['description']);
 
         /** Manipulate basic fields */
         $carbon->setTimezone(config('app.timezone'));
@@ -280,7 +280,7 @@ 
 
         /** create or get source and destination accounts  */
         $sourceInfo = [
-            'id'     => (int) $row['source_id'],
+            'id'     => (int)$row['source_id'],
             'name'   => $row['source_name'],
             'iban'   => $row['source_iban'],
             'number' => $row['source_number'],
@@ -288,7 +288,7 @@ 
         ];
 
         $destInfo = [
-            'id'     => (int) $row['destination_id'],
+            'id'     => (int)$row['destination_id'],
             'name'   => $row['destination_name'],
             'iban'   => $row['destination_iban'],
             'number' => $row['destination_number'],
@@ -330,7 +330,7 @@ 
         $transactionFactory->setForeignCurrency($foreignCurrency);
         $transactionFactory->setReconciled($row['reconciled'] ?? false);
         try {
-            $negative = $transactionFactory->createNegative((string) $row['amount'], (string) $row['foreign_amount']);
+            $negative = $transactionFactory->createNegative((string)$row['amount'], (string)$row['foreign_amount']);
         } catch (FireflyException $e) {
             Log::error('Exception creating negative transaction.');
             Log::error($e->getMessage());
@@ -349,7 +349,7 @@ 
         $transactionFactory->setForeignCurrency($foreignCurrency);
         $transactionFactory->setReconciled($row['reconciled'] ?? false);
         try {
-            $transactionFactory->createPositive((string) $row['amount'], (string) $row['foreign_amount']);
+            $transactionFactory->createPositive((string)$row['amount'], (string)$row['foreign_amount']);
         } catch (FireflyException $e) {
             Log::error('Exception creating positive transaction.');
             Log::error($e->getMessage());
@@ -541,7 +541,7 @@ 
         $json = json_encode($dataRow);
         if (false === $json) {
             // @codeCoverageIgnoreStart
-            $json = json_encode((string) microtime());
+            $json = json_encode((string)microtime());
             Log::error(sprintf('Could not hash the original row! %s', json_last_error_msg()), $dataRow);
             // @codeCoverageIgnoreEnd
         }
@@ -577,7 +577,7 @@ 
             return;
         }
 
-        $piggyBank = $this->piggyRepository->findPiggyBank((int) $data['piggy_bank_id'], $data['piggy_bank_name']);
+        $piggyBank = $this->piggyRepository->findPiggyBank((int)$data['piggy_bank_id'], $data['piggy_bank_name']);
 
         if (null !== $piggyBank) {
             $this->piggyEventFactory->create($journal, $piggyBank);
@@ -600,7 +600,7 @@ 
         $this->accountValidator->setTransactionType($transactionType);
 
         // validate source account.
-        $sourceId    = isset($data['source_id']) ? (int) $data['source_id'] : null;
+        $sourceId    = isset($data['source_id']) ? (int)$data['source_id'] : null;
         $sourceName  = $data['source_name'] ?? null;
         $validSource = $this->accountValidator->validateSource($sourceId, $sourceName, null);
 
@@ -610,7 +610,7 @@ 
         }
         Log::debug('Source seems valid.');
         // validate destination account
-        $destinationId    = isset($data['destination_id']) ? (int) $data['destination_id'] : null;
+        $destinationId    = isset($data['destination_id']) ? (int)$data['destination_id'] : null;
         $destinationName  = (string)($data['destination_name'] ?? null);
         $validDestination = $this->accountValidator->validateDestination($destinationId, $destinationName, null);
         // do something with result:

app/Repositories/Budget/BudgetRepository.php

Indentation +14 added lines, -14 removed lines

@@ -189,9 +189,9 @@ 
     {
         /** @var Collection $set */
         $set = $this->user->budgets()->where('active', 1)
-                          ->orderBy('order', 'DESC')
-                          ->orderBy('name', 'ASC')
-                          ->get();
+                            ->orderBy('order', 'DESC')
+                            ->orderBy('name', 'ASC')
+                            ->get();
 
         return $set;
     }
@@ -203,7 +203,7 @@ 
     {
         /** @var Collection $set */
         $set = $this->user->budgets()->orderBy('order', 'DESC')
-                          ->orderBy('name', 'ASC')->get();
+                            ->orderBy('name', 'ASC')->get();
 
         return $set;
     }
@@ -227,8 +227,8 @@ 
     {
         /** @var Collection $set */
         $set = $this->user->budgets()
-                          ->orderBy('order', 'DESC')
-                          ->orderBy('name', 'ASC')->where('active', 0)->get();
+                            ->orderBy('order', 'DESC')
+                            ->orderBy('name', 'ASC')->where('active', 0)->get();
 
         return $set;
     }
@@ -411,10 +411,10 @@ 
     {
         $types   = ['set_budget',];
         $actions = RuleAction::leftJoin('rules', 'rules.id', '=', 'rule_actions.rule_id')
-                             ->where('rules.user_id', $this->user->id)
-                             ->whereIn('rule_actions.action_type', $types)
-                             ->where('rule_actions.action_value', $oldName)
-                             ->get(['rule_actions.*']);
+                                ->where('rules.user_id', $this->user->id)
+                                ->whereIn('rule_actions.action_type', $types)
+                                ->where('rule_actions.action_value', $oldName)
+                                ->get(['rule_actions.*']);
         Log::debug(sprintf('Found %d actions to update.', $actions->count()));
         /** @var RuleAction $action */
         foreach ($actions as $action) {
@@ -432,10 +432,10 @@ 
     {
         $types    = ['budget_is',];
         $triggers = RuleTrigger::leftJoin('rules', 'rules.id', '=', 'rule_triggers.rule_id')
-                               ->where('rules.user_id', $this->user->id)
-                               ->whereIn('rule_triggers.trigger_type', $types)
-                               ->where('rule_triggers.trigger_value', $oldName)
-                               ->get(['rule_triggers.*']);
+                                ->where('rules.user_id', $this->user->id)
+                                ->whereIn('rule_triggers.trigger_type', $types)
+                                ->where('rule_triggers.trigger_value', $oldName)
+                                ->get(['rule_triggers.*']);
         Log::debug(sprintf('Found %d triggers to update.', $triggers->count()));
         /** @var RuleTrigger $trigger */
         foreach ($triggers as $trigger) {