firefly-iii / firefly-iii

app/Http/Controllers/Transaction/LinkController.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
  * You should have received a copy of the GNU General Public License
  * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace FireflyIII\Http\Controllers\Transaction;
 
@@ -46,7 +46,7 @@ 
         parent::__construct();
         // some useful repositories:
         $this->middleware(
-            function ($request, $next) {
+            function($request, $next) {
                 app('view')->share('title', trans('firefly.transactions'));
                 app('view')->share('mainTitleIcon', 'fa-repeat');
 

app/Factory/TransactionJournalFactory.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * TransactionJournalFactory.php
  * Copyright (c) 2018 thegrumpydictator@gmail.com

Indentation +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 
         // store date meta fields (if present):
         $fields = ['sepa-cc', 'sepa-ct-op', 'sepa-ct-id', 'sepa-db', 'sepa-country', 'sepa-ep', 'sepa-ci', 'interest_date', 'book_date', 'process_date',
-                   'due_date', 'payment_date', 'invoice_date', 'internal_reference', 'bunq_payment_id'];
+                    'due_date', 'payment_date', 'invoice_date', 'internal_reference', 'bunq_payment_id'];
 
         foreach ($fields as $field) {
             $this->storeMeta($journal, $data, $field);

app/Console/Commands/VerifyDatabase.php

Indentation +61 added lines, -61 removed lines

@@ -146,8 +146,8 @@ 
         // get invalid journals
         $errored  = [];
         $journals = DB::table('transactions')
-                      ->groupBy('transaction_journal_id')
-                      ->get(['transaction_journal_id', DB::raw('SUM(amount) AS the_sum')]);
+                        ->groupBy('transaction_journal_id')
+                        ->get(['transaction_journal_id', DB::raw('SUM(amount) AS the_sum')]);
         /** @var stdClass $entry */
         foreach ($journals as $entry) {
             if (0 !== bccomp((string)$entry->the_sum, '0')) {
@@ -227,12 +227,12 @@ 
     private function reportAccounts()
     {
         $set = Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
-                      ->leftJoin('users', 'accounts.user_id', '=', 'users.id')
-                      ->groupBy(['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email'])
-                      ->whereNull('transactions.account_id')
-                      ->get(
-                          ['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email']
-                      );
+                        ->leftJoin('users', 'accounts.user_id', '=', 'users.id')
+                        ->groupBy(['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email'])
+                        ->whereNull('transactions.account_id')
+                        ->get(
+                            ['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email']
+                        );
 
         /** @var stdClass $entry */
         foreach ($set as $entry) {
@@ -249,10 +249,10 @@ 
     private function reportBudgetLimits()
     {
         $set = Budget::leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budgets.id')
-                     ->leftJoin('users', 'budgets.user_id', '=', 'users.id')
-                     ->groupBy(['budgets.id', 'budgets.name', 'budgets.encrypted', 'budgets.user_id', 'users.email'])
-                     ->whereNull('budget_limits.id')
-                     ->get(['budgets.id', 'budgets.name', 'budgets.user_id', 'budgets.encrypted', 'users.email']);
+                        ->leftJoin('users', 'budgets.user_id', '=', 'users.id')
+                        ->groupBy(['budgets.id', 'budgets.name', 'budgets.encrypted', 'budgets.user_id', 'users.email'])
+                        ->whereNull('budget_limits.id')
+                        ->get(['budgets.id', 'budgets.name', 'budgets.user_id', 'budgets.encrypted', 'users.email']);
 
         /** @var Budget $entry */
         foreach ($set as $entry) {
@@ -273,20 +273,20 @@ 
     private function reportDeletedAccounts()
     {
         $set = Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
-                      ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-                      ->whereNotNull('accounts.deleted_at')
-                      ->whereNotNull('transactions.id')
-                      ->where(
-                          function (Builder $q) {
-                              $q->whereNull('transactions.deleted_at');
-                              $q->orWhereNull('transaction_journals.deleted_at');
-                          }
-                      )
-                      ->get(
-                          ['accounts.id as account_id', 'accounts.deleted_at as account_deleted_at', 'transactions.id as transaction_id',
-                           'transactions.deleted_at as transaction_deleted_at', 'transaction_journals.id as journal_id',
-                           'transaction_journals.deleted_at as journal_deleted_at',]
-                      );
+                        ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                        ->whereNotNull('accounts.deleted_at')
+                        ->whereNotNull('transactions.id')
+                        ->where(
+                            function (Builder $q) {
+                                $q->whereNull('transactions.deleted_at');
+                                $q->orWhereNull('transaction_journals.deleted_at');
+                            }
+                        )
+                        ->get(
+                            ['accounts.id as account_id', 'accounts.deleted_at as account_deleted_at', 'transactions.id as transaction_id',
+                            'transactions.deleted_at as transaction_deleted_at', 'transaction_journals.id as journal_id',
+                            'transaction_journals.deleted_at as journal_deleted_at',]
+                        );
         /** @var stdClass $entry */
         foreach ($set as $entry) {
             $date = $entry->transaction_deleted_at ?? $entry->journal_deleted_at;
@@ -312,17 +312,17 @@ 
         ];
         foreach ($configuration as $transactionType => $accountTypes) {
             $set = TransactionJournal::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
-                                     ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                                     ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
-                                     ->leftJoin('account_types', 'account_types.id', 'accounts.account_type_id')
-                                     ->leftJoin('users', 'users.id', '=', 'transaction_journals.user_id')
-                                     ->where('transaction_types.type', $transactionType)
-                                     ->whereIn('account_types.type', $accountTypes)
-                                     ->whereNull('transaction_journals.deleted_at')
-                                     ->get(
-                                         ['transaction_journals.id', 'transaction_journals.user_id', 'users.email', 'account_types.type as a_type',
-                                          'transaction_types.type',]
-                                     );
+                                        ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                        ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+                                        ->leftJoin('account_types', 'account_types.id', 'accounts.account_type_id')
+                                        ->leftJoin('users', 'users.id', '=', 'transaction_journals.user_id')
+                                        ->where('transaction_types.type', $transactionType)
+                                        ->whereIn('account_types.type', $accountTypes)
+                                        ->whereNull('transaction_journals.deleted_at')
+                                        ->get(
+                                            ['transaction_journals.id', 'transaction_journals.user_id', 'users.email', 'account_types.type as a_type',
+                                            'transaction_types.type',]
+                                        );
             foreach ($set as $entry) {
                 $this->error(
                     sprintf(
@@ -346,17 +346,17 @@ 
     {
         $count = 0;
         $set   = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                                   ->whereNotNull('transaction_journals.deleted_at')// USE THIS
-                                   ->whereNull('transactions.deleted_at')
-                                   ->whereNotNull('transactions.id')
-                                   ->get(
-                                       [
-                                           'transaction_journals.id as journal_id',
-                                           'transaction_journals.description',
-                                           'transaction_journals.deleted_at as journal_deleted',
-                                           'transactions.id as transaction_id',
-                                           'transactions.deleted_at as transaction_deleted_at',]
-                                   );
+                                    ->whereNotNull('transaction_journals.deleted_at')// USE THIS
+                                    ->whereNull('transactions.deleted_at')
+                                    ->whereNotNull('transactions.id')
+                                    ->get(
+                                        [
+                                            'transaction_journals.id as journal_id',
+                                            'transaction_journals.description',
+                                            'transaction_journals.deleted_at as journal_deleted',
+                                            'transactions.id as transaction_id',
+                                            'transactions.deleted_at as transaction_deleted_at',]
+                                    );
         /** @var stdClass $entry */
         foreach ($set as $entry) {
             $this->error(
@@ -377,9 +377,9 @@ 
     {
         $count = 0;
         $set   = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                                   ->groupBy('transaction_journals.id')
-                                   ->whereNull('transactions.transaction_journal_id')
-                                   ->get(['transaction_journals.id']);
+                                    ->groupBy('transaction_journals.id')
+                                    ->whereNull('transactions.transaction_journal_id')
+                                    ->get(['transaction_journals.id']);
 
         foreach ($set as $entry) {
             $this->error(
@@ -455,12 +455,12 @@ 
     private function reportTransactions()
     {
         $set = Transaction::leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                          ->whereNotNull('transactions.deleted_at')
-                          ->whereNull('transaction_journals.deleted_at')
-                          ->get(
-                              ['transactions.id as transaction_id', 'transactions.deleted_at as transaction_deleted', 'transaction_journals.id as journal_id',
-                               'transaction_journals.deleted_at',]
-                          );
+                            ->whereNotNull('transactions.deleted_at')
+                            ->whereNull('transaction_journals.deleted_at')
+                            ->get(
+                                ['transactions.id as transaction_id', 'transactions.deleted_at as transaction_deleted', 'transaction_journals.id as journal_id',
+                                'transaction_journals.deleted_at',]
+                            );
         /** @var stdClass $entry */
         foreach ($set as $entry) {
             $this->error(
@@ -476,10 +476,10 @@ 
     private function reportTransfersBudgets()
     {
         $set = TransactionJournal::distinct()
-                                 ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
-                                 ->leftJoin('budget_transaction_journal', 'transaction_journals.id', '=', 'budget_transaction_journal.transaction_journal_id')
-                                 ->whereIn('transaction_types.type', [TransactionType::TRANSFER, TransactionType::DEPOSIT])
-                                 ->whereNotNull('budget_transaction_journal.budget_id')->get(['transaction_journals.*']);
+                                    ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+                                    ->leftJoin('budget_transaction_journal', 'transaction_journals.id', '=', 'budget_transaction_journal.transaction_journal_id')
+                                    ->whereIn('transaction_types.type', [TransactionType::TRANSFER, TransactionType::DEPOSIT])
+                                    ->whereNotNull('budget_transaction_journal.budget_id')->get(['transaction_journals.*']);
 
         /** @var TransactionJournal $entry */
         foreach ($set as $entry) {

app/Console/Commands/UpgradeDatabase.php

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * UpgradeDatabase.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -99,12 +99,12 @@ 
         if (!Schema::hasTable('transaction_journals')) {
             return;
         }
-        $subQuery   = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+        $subQuery = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
                                         ->whereNull('transaction_journals.deleted_at')
                                         ->whereNull('transactions.deleted_at')
                                         ->groupBy(['transaction_journals.id'])
                                         ->select(['transaction_journals.id', DB::raw('COUNT(transactions.id) AS t_count')]);
-        $result     = DB::table(DB::raw('(' . $subQuery->toSql() . ') AS derived'))
+        $result = DB::table(DB::raw('(' . $subQuery->toSql() . ') AS derived'))
                         ->mergeBindings($subQuery->getQuery())
                         ->where('t_count', '>', 2)
                         ->select(['id', 't_count']);
@@ -129,7 +129,7 @@ 
                            ->whereIn('account_types.type', [AccountType::DEFAULT, AccountType::ASSET])->get(['accounts.*']);
 
         $accounts->each(
-            function (Account $account) {
+            function(Account $account) {
                 // get users preference, fall back to system pref.
                 $defaultCurrencyCode = Preferences::getForUser($account->user, 'currencyPreference', config('firefly.default_currency', 'EUR'))->data;
                 $defaultCurrency     = TransactionCurrency::where('code', $defaultCurrencyCode)->first();
@@ -190,7 +190,7 @@ 
             ->get(['transaction_journals.*']);
 
         $set->each(
-            function (TransactionJournal $journal) use ($repository) {
+            function(TransactionJournal $journal) use ($repository) {
                 // get the transaction with the asset account in it:
                 /** @var Transaction $transaction */
                 $transaction = $journal->transactions()
@@ -205,7 +205,7 @@ 
                 $currency     = $repository->find((int)$account->getMeta('currency_id'));
                 $transactions = $journal->transactions()->get();
                 $transactions->each(
-                    function (Transaction $transaction) use ($currency) {
+                    function(Transaction $transaction) use ($currency) {
                         if (null === $transaction->transaction_currency_id) {
                             $transaction->transaction_currency_id = $currency->id;
                             $transaction->save();
@@ -247,12 +247,12 @@ 
             ->get(['transaction_journals.*']);
 
         $set->each(
-            function (TransactionJournal $transfer) {
+            function(TransactionJournal $transfer) {
                 // select all "source" transactions:
                 /** @var Collection $transactions */
                 $transactions = $transfer->transactions()->where('amount', '<', 0)->get();
                 $transactions->each(
-                    function (Transaction $transaction) {
+                    function(Transaction $transaction) {
                         $this->updateTransactionCurrency($transaction);
                         $this->updateJournalCurrency($transaction);
                     }

app/Export/ExpandedProcessor.php

Indentation +8 added lines, -8 removed lines

@@ -104,8 +104,8 @@ 
         $collector = app(JournalCollectorInterface::class);
         $collector->setUser($this->job->user);
         $collector->setAccounts($this->accounts)->setRange($this->settings['startDate'], $this->settings['endDate'])
-                  ->withOpposingAccount()->withBudgetInformation()->withCategoryInformation()
-                  ->removeFilter(InternalTransferFilter::class);
+                    ->withOpposingAccount()->withBudgetInformation()->withCategoryInformation()
+                    ->removeFilter(InternalTransferFilter::class);
         $transactions = $collector->getJournals();
         // get some more meta data for each entry:
         $ids         = $transactions->pluck('journal_id')->toArray();
@@ -287,10 +287,10 @@ 
         $array  = array_unique($array);
         $return = [];
         $set    = AccountMeta::whereIn('account_id', $array)
-                             ->leftJoin('accounts', 'accounts.id', 'account_meta.account_id')
-                             ->where('accounts.user_id', $this->job->user_id)
-                             ->whereIn('account_meta.name', ['accountNumber', 'BIC', 'currency_id'])
-                             ->get(['account_meta.id', 'account_meta.account_id', 'account_meta.name', 'account_meta.data']);
+                                ->leftJoin('accounts', 'accounts.id', 'account_meta.account_id')
+                                ->where('accounts.user_id', $this->job->user_id)
+                                ->whereIn('account_meta.name', ['accountNumber', 'BIC', 'currency_id'])
+                                ->get(['account_meta.id', 'account_meta.account_id', 'account_meta.name', 'account_meta.data']);
         /** @var AccountMeta $meta */
         foreach ($set as $meta) {
             $id                       = (int)$meta->account_id;
@@ -311,8 +311,8 @@ 
     {
         $array  = array_unique($array);
         $notes  = Note::where('notes.noteable_type', 'FireflyIII\\Models\\TransactionJournal')
-                      ->whereIn('notes.noteable_id', $array)
-                      ->get(['notes.*']);
+                        ->whereIn('notes.noteable_id', $array)
+                        ->get(['notes.*']);
         $return = [];
         /** @var Note $note */
         foreach ($notes as $note) {

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * ExpandedProcessor.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -117,7 +117,7 @@ 
         $ibans      = array_merge($this->getIbans($assetIds), $this->getIbans($opposingIds));
         $currencies = $this->getAccountCurrencies($ibans);
         $transactions->each(
-            function (Transaction $transaction) use ($notes, $tags, $ibans, $currencies) {
+            function(Transaction $transaction) use ($notes, $tags, $ibans, $currencies) {
                 $journalId                            = (int)$transaction->journal_id;
                 $accountId                            = (int)$transaction->account_id;
                 $opposingId                           = (int)$transaction->opposing_account_id;
@@ -160,7 +160,7 @@ 
     public function convertJournals(): bool
     {
         $this->journals->each(
-            function (Transaction $transaction) {
+            function(Transaction $transaction) {
                 $this->exportEntries->push(Entry::fromTransaction($transaction));
             }
         );
@@ -335,7 +335,7 @@ 
      */
     private function getTags(array $array): array
     {
-        $set    = DB::table('tag_transaction_journal')
+        $set = DB::table('tag_transaction_journal')
                     ->whereIn('tag_transaction_journal.transaction_journal_id', $array)
                     ->leftJoin('tags', 'tag_transaction_journal.tag_id', '=', 'tags.id')
                     ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'tag_transaction_journal.transaction_journal_id')

app/Generator/Report/Standard/YearReportGenerator.php

Indentation -1 removed lines

@@ -41,7 +41,6 @@
     /**
      * @return string
      *
-
      */
     public function generate(): string
     {

app/Services/Bunq/Request/BunqRequest.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
  * You should have received a copy of the GNU General Public License
  * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace FireflyIII\Services\Bunq\Request;
 
@@ -137,7 +137,7 @@ 
                 $toSign .= sprintf("%s: %s\n", $name, $value);
             }
         }
-        $toSign    .= "\n" . $data;
+        $toSign .= "\n" . $data;
         $signature = '';
 
 

app/Services/Github/Request/UpdateRequest.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
  * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace FireflyIII\Services\Github\Request;
 
@@ -59,7 +59,7 @@ 
         //fetch the products for each category
         if (isset($releaseXml->entry)) {
             foreach ($releaseXml->entry as $entry) {
-                $array            = [
+                $array = [
                     'id'      => (string)$entry->id,
                     'updated' => (string)$entry->updated,
                     'title'   => (string)$entry->title,

app/Api/V1/Requests/BillRequest.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * BillRequest.php
  * Copyright (c) 2018 thegrumpydictator@gmail.com
@@ -87,7 +87,7 @@ 
                 break;
             case 'PUT':
             case 'PATCH':
-                $bill           = $this->route()->parameter('bill');
+                $bill = $this->route()->parameter('bill');
                 $rules['name']  .= ',' . $bill->id;
                 $rules['match'] .= ',' . $bill->id;
                 break;
@@ -106,7 +106,7 @@ 
     public function withValidator(Validator $validator): void
     {
         $validator->after(
-            function (Validator $validator) {
+            function(Validator $validator) {
                 $data = $validator->getData();
                 $min  = (float)($data['amount_min'] ?? 0);
                 $max  = (float)($data['amount_max'] ?? 0);