firefly-iii / firefly-iii

app/Http/Controllers/JavascriptController.php

Spacing +4 added lines, -4 removed lines

@@ -60,7 +60,7 @@ 
         /** @var Account $account */
         foreach ($accounts as $account) {
             $accountId = $account->id;
-            $currency  = (int) $repository->getMetaValue($account, 'currency_id');
+            $currency  = (int)$repository->getMetaValue($account, 'currency_id');
             /** @noinspection NullPointerExceptionInspection */
             $currency                     = 0 === $currency ? $default->id : $currency;
             $entry                        = ['preferredCurrency' => $currency, 'name' => $account->name];
@@ -106,11 +106,11 @@ 
      */
     public function variables(Request $request, AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository): Response
     {
-        $account    = $repository->findNull((int) $request->get('account'));
+        $account    = $repository->findNull((int)$request->get('account'));
         $currencyId = 0;
         if (null !== $account) {
             // TODO we can use getAccountCurrency() instead
-            $currencyId = (int) $repository->getMetaValue($account, 'currency_id');
+            $currencyId = (int)$repository->getMetaValue($account, 'currency_id');
         }
         /** @var TransactionCurrency $currency */
         $currency = $currencyRepository->findNull($currencyId);
@@ -126,7 +126,7 @@ 
         /** @noinspection NullPointerExceptionInspection */
         $lang      = $pref->data;
         $dateRange = $this->getDateRangeConfig();
-        $uid       = substr(hash('sha256', sprintf('%s-%s-%s', (string) config('app.key'), auth()->user()->id, auth()->user()->email)), 0, 12);
+        $uid       = substr(hash('sha256', sprintf('%s-%s-%s', (string)config('app.key'), auth()->user()->id, auth()->user()->email)), 0, 12);
 
         $data = [
             'currencyCode'    => $currency->code,

app/Http/Controllers/ProfileController.php

Spacing +19 added lines, -19 removed lines

@@ -71,8 +71,8 @@ 
         parent::__construct();
 
         $this->middleware(
-            static function ($request, $next) {
-                app('view')->share('title', (string) trans('firefly.profile'));
+            static function($request, $next) {
+                app('view')->share('title', (string)trans('firefly.profile'));
                 app('view')->share('mainTitleIcon', 'fa-user');
 
                 return $next($request);
@@ -103,7 +103,7 @@ 
 
         $title        = auth()->user()->email;
         $email        = auth()->user()->email;
-        $subTitle     = (string) trans('firefly.change_your_email');
+        $subTitle     = (string)trans('firefly.change_your_email');
         $subTitleIcon = 'fa-envelope';
 
         return view('profile.change-email', compact('title', 'subTitle', 'subTitleIcon', 'email'));
@@ -128,7 +128,7 @@ 
         }
 
         $title        = auth()->user()->email;
-        $subTitle     = (string) trans('firefly.change_your_password');
+        $subTitle     = (string)trans('firefly.change_your_password');
         $subTitleIcon = 'fa-key';
 
         return view('profile.change-password', compact('title', 'subTitle', 'subTitleIcon'));
@@ -219,7 +219,7 @@ 
         $repository->unblockUser($user);
 
         // return to login.
-        session()->flash('success', (string) trans('firefly.login_with_new_email'));
+        session()->flash('success', (string)trans('firefly.login_with_new_email'));
 
         return redirect(route('login'));
     }
@@ -240,7 +240,7 @@ 
             // @codeCoverageIgnoreEnd
         }
         $title        = auth()->user()->email;
-        $subTitle     = (string) trans('firefly.delete_account');
+        $subTitle     = (string)trans('firefly.delete_account');
         $subTitleIcon = 'fa-trash';
 
         return view('profile.delete-account', compact('title', 'subTitle', 'subTitleIcon'));
@@ -260,8 +260,8 @@ 
         $user = auth()->user();
 
         $repository->setMFACode($user, null);
-        session()->flash('success', (string) trans('firefly.pref_two_factor_auth_disabled'));
-        session()->flash('info', (string) trans('firefly.pref_two_factor_auth_remove_it'));
+        session()->flash('success', (string)trans('firefly.pref_two_factor_auth_disabled'));
+        session()->flash('info', (string)trans('firefly.pref_two_factor_auth_remove_it'));
 
         return redirect(route('profile.index'));
     }
@@ -284,7 +284,7 @@ 
 
         // If FF3 already has a secret, just set the two factor auth enabled to 1,
         // and let the user continue with the existing secret.
-        session()->flash('info', (string) trans('firefly.2fa_already_enabled'));
+        session()->flash('info', (string)trans('firefly.2fa_already_enabled'));
 
         return redirect(route('profile.index'));
     }
@@ -336,7 +336,7 @@ 
                                   ->setBlocks(2)    // Every code must have 7 blocks
                                   ->setChars(6)    // Each block must have 16 chars
                                   ->toArray();
-        $codes         = implode("\r\n", $recoveryCodes);
+        $codes = implode("\r\n", $recoveryCodes);
 
         app('preferences')->set('mfa_recovery', $recoveryCodes);
         app('preferences')->mark();
@@ -368,7 +368,7 @@ 
         $newEmail = $request->string('email');
         $oldEmail = $user->email;
         if ($newEmail === $user->email) {
-            session()->flash('error', (string) trans('firefly.email_not_changed'));
+            session()->flash('error', (string)trans('firefly.email_not_changed'));
 
             return redirect(route('profile.change-email'))->withInput();
         }
@@ -378,7 +378,7 @@ 
             Auth::guard()->logout();
             $request->session()->invalidate();
 
-            session()->flash('success', (string) trans('firefly.email_changed'));
+            session()->flash('success', (string)trans('firefly.email_changed'));
 
             return redirect(route('index'));
         }
@@ -393,7 +393,7 @@ 
         // force user logout.
         Auth::guard()->logout();
         $request->session()->invalidate();
-        session()->flash('success', (string) trans('firefly.email_changed'));
+        session()->flash('success', (string)trans('firefly.email_changed'));
 
         return redirect(route('index'));
     }
@@ -431,7 +431,7 @@ 
         }
 
         $repository->changePassword($user, $request->get('new_password'));
-        session()->flash('success', (string) trans('firefly.password_changed'));
+        session()->flash('success', (string)trans('firefly.password_changed'));
 
         return redirect(route('profile.index'));
     }
@@ -454,7 +454,7 @@ 
         $secret = session()->get('two-factor-secret');
         $repository->setMFACode($user, $secret);
 
-        session()->flash('success', (string) trans('firefly.saved_preferences'));
+        session()->flash('success', (string)trans('firefly.saved_preferences'));
         app('preferences')->mark();
 
         // also save the code so replay attack is prevented.
@@ -486,7 +486,7 @@ 
     public function postDeleteAccount(UserRepositoryInterface $repository, DeleteAccountFormRequest $request)
     {
         if (!Hash::check($request->get('password'), auth()->user()->password)) {
-            session()->flash('error', (string) trans('firefly.invalid_password'));
+            session()->flash('error', (string)trans('firefly.invalid_password'));
 
             return redirect(route('profile.delete-account'));
         }
@@ -512,7 +512,7 @@ 
         $user  = auth()->user();
         $token = $user->generateAccessToken();
         app('preferences')->set('access_token', $token);
-        session()->flash('success', (string) trans('firefly.token_regenerated'));
+        session()->flash('success', (string)trans('firefly.token_regenerated'));
 
         return redirect(route('profile.index'));
     }
@@ -555,7 +555,7 @@ 
         /** @var string $match */
         $match = null;
         foreach ($set as $entry) {
-            $hashed = hash('sha256', sprintf('%s%s', (string) config('app.key'), $entry->data));
+            $hashed = hash('sha256', sprintf('%s%s', (string)config('app.key'), $entry->data));
             if ($hashed === $hash) {
                 $match = $entry->data;
                 break;
@@ -570,7 +570,7 @@ 
         $repository->unblockUser($user);
 
         // return to login.
-        session()->flash('success', (string) trans('firefly.login_with_old_email'));
+        session()->flash('success', (string)trans('firefly.login_with_old_email'));
 
         return redirect(route('login'));
     }

app/Handlers/Events/UserEventHandler.php

Spacing +2 added lines, -2 removed lines

@@ -165,8 +165,8 @@
         $user      = $event->user;
         $ipAddress = $event->ipAddress;
         $token     = app('preferences')->getForUser($user, 'email_change_undo_token', 'invalid');
-        $hashed    = hash('sha256', sprintf('%s%s', (string) config('app.key'), $oldEmail));
-        $uri       = route('profile.undo-email-change', [$token->data,$hashed]);
+        $hashed    = hash('sha256', sprintf('%s%s', (string)config('app.key'), $oldEmail));
+        $uri       = route('profile.undo-email-change', [$token->data, $hashed]);
         try {
             Mail::to($oldEmail)->send(new UndoEmailChangeMail($newEmail, $oldEmail, $uri, $ipAddress));
             // @codeCoverageIgnoreStart

app/Models/Account.php

Spacing +2 added lines, -2 removed lines

@@ -131,7 +131,7 @@ 
     public static function routeBinder(string $value): Account
     {
         if (auth()->check()) {
-            $accountId = (int) $value;
+            $accountId = (int)$value;
             /** @var User $user */
             $user = auth()->user();
             /** @var Account $account */
@@ -253,7 +253,7 @@ 
     public function setVirtualBalanceAttribute($value): void
     {
         $value = (string)$value;
-        if('' === $value) {
+        if ('' === $value) {
             $value = null;
         }
         $this->attributes['virtual_balance'] = $value;

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'],
@@ -289,7 +289,7 @@ 
         ];
 
         $destInfo = [
-            'id'          => (int) $row['destination_id'],
+            'id'          => (int)$row['destination_id'],
             'name'        => $row['destination_name'],
             'iban'        => $row['destination_iban'],
             'number'      => $row['destination_number'],
@@ -334,7 +334,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());
@@ -353,7 +353,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());
@@ -547,7 +547,7 @@ 
         $json = json_encode($dataRow, JSON_THROW_ON_ERROR, 512);
         if (false === $json) {
             // @codeCoverageIgnoreStart
-            $json = json_encode((string) microtime(), JSON_THROW_ON_ERROR, 512);
+            $json = json_encode((string)microtime(), JSON_THROW_ON_ERROR, 512);
             Log::error(sprintf('Could not hash the original row! %s', json_last_error_msg()), $dataRow);
             // @codeCoverageIgnoreEnd
         }
@@ -583,7 +583,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);
@@ -606,7 +606,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);
 
@@ -616,7 +616,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/Support/Steam.php

Indentation +33 added lines, -33 removed lines

@@ -65,18 +65,18 @@ 
         }
         // first part: get all balances in own currency:
         $transactions  = $account->transactions()
-                                 ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-                                 ->where('transaction_journals.date', '<=', $date->format('Y-m-d 23:59:59'))
-                                 ->where('transactions.transaction_currency_id', $currency->id)
-                                 ->get(['transactions.amount'])->toArray();
+                                    ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                                    ->where('transaction_journals.date', '<=', $date->format('Y-m-d 23:59:59'))
+                                    ->where('transactions.transaction_currency_id', $currency->id)
+                                    ->get(['transactions.amount'])->toArray();
         $nativeBalance = $this->sumTransactions($transactions, 'amount');
         // get all balances in foreign currency:
         $transactions   = $account->transactions()
-                                  ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-                                  ->where('transaction_journals.date', '<=', $date->format('Y-m-d 23:59:59'))
-                                  ->where('transactions.foreign_currency_id', $currency->id)
-                                  ->where('transactions.transaction_currency_id', '!=', $currency->id)
-                                  ->get(['transactions.foreign_amount'])->toArray();
+                                    ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                                    ->where('transaction_journals.date', '<=', $date->format('Y-m-d 23:59:59'))
+                                    ->where('transactions.foreign_currency_id', $currency->id)
+                                    ->where('transactions.transaction_currency_id', '!=', $currency->id)
+                                    ->get(['transactions.foreign_amount'])->toArray();
         $foreignBalance = $this->sumTransactions($transactions, 'foreign_amount');
 
         // check:
@@ -122,10 +122,10 @@ 
 
 
         $transactions  = $account->transactions()
-                                 ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-                                 ->where('transaction_journals.date', '<=', $date->format('Y-m-d'))
-                                 ->where('transactions.transaction_currency_id', $currencyId)
-                                 ->get(['transactions.amount'])->toArray();
+                                    ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                                    ->where('transaction_journals.date', '<=', $date->format('Y-m-d'))
+                                    ->where('transactions.transaction_currency_id', $currencyId)
+                                    ->get(['transactions.amount'])->toArray();
         $nativeBalance = $this->sumTransactions($transactions, 'amount');
 
         // get all balances in foreign currency:
@@ -209,23 +209,23 @@ 
 
         // query!
         $set = $account->transactions()
-                       ->leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                       ->where('transaction_journals.date', '>=', $start->format('Y-m-d 00:00:00'))
-                       ->where('transaction_journals.date', '<=', $end->format('Y-m-d  23:59:59'))
-                       ->groupBy('transaction_journals.date')
-                       ->groupBy('transactions.transaction_currency_id')
-                       ->groupBy('transactions.foreign_currency_id')
-                       ->orderBy('transaction_journals.date', 'ASC')
-                       ->whereNull('transaction_journals.deleted_at')
-                       ->get(
-                           [
-                               'transaction_journals.date',
-                               'transactions.transaction_currency_id',
-                               DB::raw('SUM(transactions.amount) AS modified'),
-                               'transactions.foreign_currency_id',
-                               DB::raw('SUM(transactions.foreign_amount) AS modified_foreign'),
-                           ]
-                       );
+                        ->leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                        ->where('transaction_journals.date', '>=', $start->format('Y-m-d 00:00:00'))
+                        ->where('transaction_journals.date', '<=', $end->format('Y-m-d  23:59:59'))
+                        ->groupBy('transaction_journals.date')
+                        ->groupBy('transactions.transaction_currency_id')
+                        ->groupBy('transactions.foreign_currency_id')
+                        ->orderBy('transaction_journals.date', 'ASC')
+                        ->whereNull('transaction_journals.deleted_at')
+                        ->get(
+                            [
+                                'transaction_journals.date',
+                                'transactions.transaction_currency_id',
+                                DB::raw('SUM(transactions.amount) AS modified'),
+                                'transactions.foreign_currency_id',
+                                DB::raw('SUM(transactions.foreign_amount) AS modified_foreign'),
+                            ]
+                        );
 
         $currentBalance = $startBalance;
         /** @var Transaction $entry */
@@ -497,9 +497,9 @@ 
         $list = [];
 
         $set = auth()->user()->transactions()
-                     ->whereIn('transactions.account_id', $accounts)
-                     ->groupBy(['transactions.account_id', 'transaction_journals.user_id'])
-                     ->get(['transactions.account_id', DB::raw('MAX(transaction_journals.date) AS max_date')]);
+                        ->whereIn('transactions.account_id', $accounts)
+                        ->groupBy(['transactions.account_id', 'transaction_journals.user_id'])
+                        ->get(['transactions.account_id', DB::raw('MAX(transaction_journals.date) AS max_date')]);
 
         foreach ($set as $entry) {
             $list[(int)$entry->account_id] = new Carbon($entry->max_date);

Spacing +6 added lines, -6 removed lines

@@ -64,14 +64,14 @@ 
             $currency = $repository->getAccountCurrency($account) ?? app('amount')->getDefaultCurrencyByUser($account->user);
         }
         // first part: get all balances in own currency:
-        $transactions  = $account->transactions()
+        $transactions = $account->transactions()
                                  ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
                                  ->where('transaction_journals.date', '<=', $date->format('Y-m-d 23:59:59'))
                                  ->where('transactions.transaction_currency_id', $currency->id)
                                  ->get(['transactions.amount'])->toArray();
         $nativeBalance = $this->sumTransactions($transactions, 'amount');
         // get all balances in foreign currency:
-        $transactions   = $account->transactions()
+        $transactions = $account->transactions()
                                   ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
                                   ->where('transaction_journals.date', '<=', $date->format('Y-m-d 23:59:59'))
                                   ->where('transactions.foreign_currency_id', $currency->id)
@@ -121,7 +121,7 @@ 
         $currencyId = (int)$repository->getMetaValue($account, 'currency_id');
 
 
-        $transactions  = $account->transactions()
+        $transactions = $account->transactions()
                                  ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
                                  ->where('transaction_journals.date', '<=', $date->format('Y-m-d'))
                                  ->where('transactions.transaction_currency_id', $currencyId)
@@ -273,7 +273,7 @@ 
         if ($cache->has()) {
             return $cache->get(); // @codeCoverageIgnore
         }
-        $query    = $account->transactions()
+        $query = $account->transactions()
                             ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
                             ->where('transaction_journals.date', '<=', $date->format('Y-m-d 23:59:59'))
                             ->groupBy('transactions.transaction_currency_id');
@@ -367,7 +367,7 @@ 
      */
     public function cleanString(string $string): string
     {
-        $search  = [
+        $search = [
             "\u{0001}", // start of heading
             "\u{0002}", // start of text
             "\u{0003}", // end of text
@@ -430,7 +430,7 @@ 
      */
     public function nlCleanString(string $string): string
     {
-        $search  = [
+        $search = [
             "\u{0001}", // start of heading
             "\u{0002}", // start of text
             "\u{0003}", // end of text