firefly-iii / firefly-iii

app/Factory/TransactionJournalFactory.php

Spacing +14 added lines, -14 removed lines

@@ -213,7 +213,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']));
@@ -260,11 +260,11 @@ 
         $type            = $this->typeRepository->findTransactionType(null, $row['type']);
         $carbon          = $row['date'] ?? today(config('app.timezone'));
         $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'));
@@ -283,7 +283,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'],
@@ -292,7 +292,7 @@ 
         ];
 
         $destInfo = [
-            'id'          => (int) $row['destination_id'],
+            'id'          => (int)$row['destination_id'],
             'name'        => $row['destination_name'],
             'iban'        => $row['destination_iban'],
             'number'      => $row['destination_number'],
@@ -337,7 +337,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());
@@ -356,7 +356,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());
@@ -537,7 +537,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
         }
@@ -573,7 +573,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);
@@ -596,8 +596,8 @@ 
         $this->accountValidator->setTransactionType($transactionType);
 
         // validate source account.
-        $sourceId    = $data['source_id'] ? (int) $data['source_id'] : null;
-        $sourceName  = $data['source_name'] ? (string) $data['source_name'] : null;
+        $sourceId    = $data['source_id'] ? (int)$data['source_id'] : null;
+        $sourceName  = $data['source_name'] ? (string)$data['source_name'] : null;
         $validSource = $this->accountValidator->validateSource($sourceId, $sourceName, null);
 
         // do something with result:
@@ -606,8 +606,8 @@ 
         }
         Log::debug('Source seems valid.');
         // validate destination account
-        $destinationId    = $data['destination_id'] ? (int) $data['destination_id'] : null;
-        $destinationName  = $data['destination_name'] ? (string) $data['destination_name'] : null;
+        $destinationId    = $data['destination_id'] ? (int)$data['destination_id'] : null;
+        $destinationName  = $data['destination_name'] ? (string)$data['destination_name'] : null;
         $validDestination = $this->accountValidator->validateDestination($destinationId, $destinationName, null);
         // do something with result:
         if (false === $validDestination) {

app/Repositories/PiggyBank/ModifiesPiggyBanks.php

Spacing +8 added lines, -8 removed lines

@@ -102,9 +102,9 @@ 
     public function canAddAmount(PiggyBank $piggyBank, string $amount): bool
     {
         $leftOnAccount = $this->leftOnAccount($piggyBank, today(config('app.timezone')));
-        $savedSoFar    = (string) $this->getRepetition($piggyBank)->currentamount;
+        $savedSoFar    = (string)$this->getRepetition($piggyBank)->currentamount;
         $leftToSave    = bcsub($piggyBank->targetamount, $savedSoFar);
-        $maxAmount     = (string) min(round($leftOnAccount, 12), round($leftToSave, 12));
+        $maxAmount     = (string)min(round($leftOnAccount, 12), round($leftToSave, 12));
         $compare       = bccomp($amount, $maxAmount);
         $result        = $compare <= 0;
 
@@ -142,7 +142,7 @@ 
         $set     = $this->user->piggyBanks()->orderBy('order', 'ASC')->get();
         $current = 1;
         foreach ($set as $piggyBank) {
-            if ((int) $piggyBank->order !== $current) {
+            if ((int)$piggyBank->order !== $current) {
                 $piggyBank->order = $current;
                 $piggyBank->save();
             }
@@ -316,7 +316,7 @@ 
             }
         }
         // try also with ID:
-        $objectGroupId = (int) ($data['object_group_id'] ?? 0);
+        $objectGroupId = (int)($data['object_group_id'] ?? 0);
         if (0 !== $objectGroupId) {
             $objectGroup = $this->findObjectGroupById($objectGroupId);
             if (null !== $objectGroup) {
@@ -340,7 +340,7 @@ 
             $piggyBank->name = $data['name'];
         }
         if (isset($data['account_id']) && 0 !== $data['account_id']) {
-            $piggyBank->account_id = (int) $data['account_id'];
+            $piggyBank->account_id = (int)$data['account_id'];
         }
         if (isset($data['targetamount']) && '' !== $data['targetamount']) {
             $piggyBank->targetamount = $data['targetamount'];
@@ -354,8 +354,8 @@ 
         $this->updateNote($piggyBank, $data['notes'] ?? '');
 
         // update the order of the piggy bank:
-        $oldOrder = (int) $piggyBank->order;
-        $newOrder = (int) ($data['order'] ?? $oldOrder);
+        $oldOrder = (int)$piggyBank->order;
+        $newOrder = (int)($data['order'] ?? $oldOrder);
         if ($oldOrder !== $newOrder) {
             $this->updateOrder($piggyBank, $oldOrder, $newOrder);
         }
@@ -382,7 +382,7 @@ 
             }
         }
         // try also with ID:
-        $objectGroupId = (int) ($data['object_group_id'] ?? 0);
+        $objectGroupId = (int)($data['object_group_id'] ?? 0);
         if (0 !== $objectGroupId) {
             $objectGroup = $this->findObjectGroupById($objectGroupId);
             if (null !== $objectGroup) {

app/Support/Twig/TransactionGroupTwig.php

Indentation +12 added lines, -12 removed lines

@@ -66,10 +66,10 @@ 
                     Log::warning('Twig TransactionGroup::journalGetMetaDate should NOT be called in the TEST environment!');
                 }
                 $entry = DB::table('journal_meta')
-                           ->where('name', $metaField)
-                           ->where('transaction_journal_id', $journalId)
-                           ->whereNull('deleted_at')
-                           ->first();
+                            ->where('name', $metaField)
+                            ->where('transaction_journal_id', $journalId)
+                            ->whereNull('deleted_at')
+                            ->first();
                 if (null === $entry) {
                     return today(config('app.timezone'));
                 }
@@ -91,10 +91,10 @@ 
                     Log::warning('Twig TransactionGroup::journalGetMetaField should NOT be called in the TEST environment!');
                 }
                 $entry = DB::table('journal_meta')
-                           ->where('name', $metaField)
-                           ->where('transaction_journal_id', $journalId)
-                           ->whereNull('deleted_at')
-                           ->first();
+                            ->where('name', $metaField)
+                            ->where('transaction_journal_id', $journalId)
+                            ->whereNull('deleted_at')
+                            ->first();
                 if (null === $entry) {
                     return '';
                 }
@@ -113,10 +113,10 @@ 
             'journalHasMeta',
             static function (int $journalId, string $metaField) {
                 $count = DB::table('journal_meta')
-                           ->where('name', $metaField)
-                           ->where('transaction_journal_id', $journalId)
-                           ->whereNull('deleted_at')
-                           ->count();
+                            ->where('name', $metaField)
+                            ->where('transaction_journal_id', $journalId)
+                            ->whereNull('deleted_at')
+                            ->count();
 
                 return 1 === $count;
             }

app/Jobs/SubmitTelemetryData.php

Spacing +3 added lines, -3 removed lines

@@ -102,13 +102,13 @@ 
         ];
         try {
             $result = $client->post($url, $options);
-        } catch (GuzzleException|Exception $e) {
+        } catch (GuzzleException | Exception $e) {
             Log::error($e->getMessage());
             Log::error($e->getTraceAsString());
             Log::error('Could not submit telemetry.');
             throw new FireflyException(sprintf('Could not submit telemetry: %s', $e->getMessage()));
         }
-        $body       = (string) $result->getBody();
+        $body       = (string)$result->getBody();
         $statusCode = $result->getStatusCode();
         Log::info(sprintf('Result of submission [%d]: %s', $statusCode, $body));
         if (200 === $statusCode) {
@@ -150,7 +150,7 @@ 
     private function markAsSubmitted(Collection $telemetry): void
     {
         $telemetry->each(
-            static function (Telemetry $entry) {
+            static function(Telemetry $entry) {
                 $entry->submitted = today(config('app.timezone'));
                 $entry->save();
             }

app/Http/Requests/ReportFormRequest.php

Spacing +7 added lines, -7 removed lines

@@ -63,7 +63,7 @@ 
         $collection = new Collection;
         if (is_array($set)) {
             foreach ($set as $accountId) {
-                $account = $repository->findNull((int) $accountId);
+                $account = $repository->findNull((int)$accountId);
                 if (null !== $account) {
                     $collection->push($account);
                 }
@@ -86,7 +86,7 @@ 
         $collection = new Collection;
         if (is_array($set)) {
             foreach ($set as $budgetId) {
-                $budget = $repository->findNull((int) $budgetId);
+                $budget = $repository->findNull((int)$budgetId);
                 if (null !== $budget) {
                     $collection->push($budget);
                 }
@@ -109,7 +109,7 @@ 
         $collection = new Collection;
         if (is_array($set)) {
             foreach ($set as $categoryId) {
-                $category = $repository->findNull((int) $categoryId);
+                $category = $repository->findNull((int)$categoryId);
                 if (null !== $category) {
                     $collection->push($category);
                 }
@@ -132,7 +132,7 @@ 
         $collection = new Collection;
         if (is_array($set)) {
             foreach ($set as $accountId) {
-                $account = $repository->findNull((int) $accountId);
+                $account = $repository->findNull((int)$accountId);
                 if (null !== $account) {
                     $collection->push($account);
                 }
@@ -153,7 +153,7 @@ 
     {
         $date  = today(config('app.timezone'));
         $range = $this->get('daterange');
-        $parts = explode(' - ', (string) $range);
+        $parts = explode(' - ', (string)$range);
         if (2 === count($parts)) {
             try {
                 $date = new Carbon($parts[1]);
@@ -181,7 +181,7 @@ 
     {
         $date  = today(config('app.timezone'));
         $range = $this->get('daterange');
-        $parts = explode(' - ', (string) $range);
+        $parts = explode(' - ', (string)$range);
         if (2 === count($parts)) {
             try {
                 $date = new Carbon($parts[0]);
@@ -217,7 +217,7 @@ 
                     $collection->push($tag);
                     continue;
                 }
-                $tag = $repository->findNull((int) $tagTag);
+                $tag = $repository->findNull((int)$tagTag);
                 if (null !== $tag) {
                     $collection->push($tag);
                     continue;

app/Http/Controllers/Account/ShowController.php

Spacing +10 added lines, -10 removed lines

@@ -62,9 +62,9 @@ 
 
         // translations:
         $this->middleware(
-            function ($request, $next) {
+            function($request, $next) {
                 app('view')->share('mainTitleIcon', 'fa-credit-card');
-                app('view')->share('title', (string) trans('firefly.accounts'));
+                app('view')->share('title', (string)trans('firefly.accounts'));
 
                 $this->repository    = app(AccountRepositoryInterface::class);
                 $this->currencyRepos = app(CurrencyRepositoryInterface::class);
@@ -90,7 +90,7 @@ 
      */
     public function show(Request $request, Account $account, Carbon $start = null, Carbon $end = null)
     {
-        $objectType       = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
+        $objectType = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
 
         if (!$this->isEditableAccount($account)) {
             return $this->redirectAccountToAccount($account); // @codeCoverageIgnore
@@ -108,12 +108,12 @@ 
         $attachments      = $this->repository->getAttachments($account);
         $today            = today(config('app.timezone'));
         $subTitleIcon     = config(sprintf('firefly.subIconsByIdentifier.%s', $account->accountType->type));
-        $page             = (int) $request->get('page');
-        $pageSize         = (int) app('preferences')->get('listPageSize', 50)->data;
+        $page             = (int)$request->get('page');
+        $pageSize         = (int)app('preferences')->get('listPageSize', 50)->data;
         $currency         = $this->repository->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
         $fStart           = $start->formatLocalized($this->monthAndDayFormat);
         $fEnd             = $end->formatLocalized($this->monthAndDayFormat);
-        $subTitle         = (string) trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]);
+        $subTitle         = (string)trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]);
         $chartUri         = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
         $firstTransaction = $this->repository->oldestJournalDate($account) ?? $start;
         $periods          = $this->getAccountPeriodOverview($account, $firstTransaction, $end);
@@ -171,16 +171,16 @@ 
 
         $location     = $this->repository->getLocation($account);
         $isLiability  = $this->repository->isLiability($account);
-        $attachments      = $this->repository->getAttachments($account);
+        $attachments = $this->repository->getAttachments($account);
         $objectType   = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
         $end          = today(config('app.timezone'));
         $today        = today(config('app.timezone'));
         $start        = $this->repository->oldestJournalDate($account) ?? Carbon::now()->startOfMonth();
         $subTitleIcon = config('firefly.subIconsByIdentifier.' . $account->accountType->type);
-        $page         = (int) $request->get('page');
-        $pageSize     = (int) app('preferences')->get('listPageSize', 50)->data;
+        $page         = (int)$request->get('page');
+        $pageSize     = (int)app('preferences')->get('listPageSize', 50)->data;
         $currency     = $this->repository->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
-        $subTitle     = (string) trans('firefly.all_journals_for_account', ['name' => $account->name]);
+        $subTitle     = (string)trans('firefly.all_journals_for_account', ['name' => $account->name]);
         $periods      = new Collection;
         /** @var GroupCollectorInterface $collector */
         $collector = app(GroupCollectorInterface::class);

app/Http/Controllers/Budget/ShowController.php

Indentation +5 added lines, -5 removed lines

@@ -103,7 +103,7 @@ 
         /** @var GroupCollectorInterface $collector */
         $collector = app(GroupCollectorInterface::class);
         $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setLimit($pageSize)->setPage($page)
-                  ->withoutBudget()->withAccountInformation()->withCategoryInformation();
+                    ->withoutBudget()->withAccountInformation()->withCategoryInformation();
         $groups = $collector->getPaginatedGroups();
         $groups->setPath(route('budgets.no-budget'));
 
@@ -130,7 +130,7 @@ 
         /** @var GroupCollectorInterface $collector */
         $collector = app(GroupCollectorInterface::class);
         $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setLimit($pageSize)->setPage($page)
-                  ->withoutBudget()->withAccountInformation()->withCategoryInformation();
+                    ->withoutBudget()->withAccountInformation()->withCategoryInformation();
         $groups = $collector->getPaginatedGroups();
         $groups->setPath(route('budgets.no-budget'));
 
@@ -163,8 +163,8 @@ 
         /** @var GroupCollectorInterface $collector */
         $collector = app(GroupCollectorInterface::class);
         $collector->setRange($allStart, $allEnd)->setBudget($budget)
-                  ->withAccountInformation()
-                  ->setLimit($pageSize)->setPage($page)->withBudgetInformation()->withCategoryInformation();
+                    ->withAccountInformation()
+                    ->setLimit($pageSize)->setPage($page)->withBudgetInformation()->withCategoryInformation();
         $groups = $collector->getPaginatedGroups();
         $groups->setPath(route('budgets.show', [$budget->id]));
 
@@ -206,7 +206,7 @@ 
         $collector = app(GroupCollectorInterface::class);
 
         $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date)->withAccountInformation()
-                  ->setBudget($budget)->setLimit($pageSize)->setPage($page)->withBudgetInformation()->withCategoryInformation();
+                    ->setBudget($budget)->setLimit($pageSize)->setPage($page)->withBudgetInformation()->withCategoryInformation();
         $groups = $collector->getPaginatedGroups();
         $groups->setPath(route('budgets.show', [$budget->id, $budgetLimit->id]));
         /** @var Carbon $start */

Spacing +14 added lines, -14 removed lines

@@ -62,8 +62,8 @@ 
         app('view')->share('showCategory', true);
         parent::__construct();
         $this->middleware(
-            function ($request, $next) {
-                app('view')->share('title', (string) trans('firefly.budgets'));
+            function($request, $next) {
+                app('view')->share('title', (string)trans('firefly.budgets'));
                 app('view')->share('mainTitleIcon', 'fa-pie-chart');
                 $this->journalRepos = app(JournalRepositoryInterface::class);
                 $this->repository = app(BudgetRepositoryInterface::class);
@@ -97,8 +97,8 @@ 
         $first     = $this->journalRepos->firstNull();
         $firstDate = null !== $first ? $first->date : $start;
         $periods   = $this->getNoBudgetPeriodOverview($firstDate, $end);
-        $page      = (int) $request->get('page');
-        $pageSize  = (int) app('preferences')->get('listPageSize', 50)->data;
+        $page      = (int)$request->get('page');
+        $pageSize  = (int)app('preferences')->get('listPageSize', 50)->data;
 
         /** @var GroupCollectorInterface $collector */
         $collector = app(GroupCollectorInterface::class);
@@ -120,12 +120,12 @@ 
     public function noBudgetAll(Request $request)
     {
 
-        $subTitle = (string) trans('firefly.all_journals_without_budget');
+        $subTitle = (string)trans('firefly.all_journals_without_budget');
         $first    = $this->journalRepos->firstNull();
         $start    = null === $first ? new Carbon : $first->date;
         $end      = today(config('app.timezone'));
-        $page     = (int) $request->get('page');
-        $pageSize = (int) app('preferences')->get('listPageSize', 50)->data;
+        $page     = (int)$request->get('page');
+        $pageSize = (int)app('preferences')->get('listPageSize', 50)->data;
 
         /** @var GroupCollectorInterface $collector */
         $collector = app(GroupCollectorInterface::class);
@@ -153,8 +153,8 @@ 
         $allEnd   = today();
 
 
-        $page       = (int) $request->get('page');
-        $pageSize   = (int) app('preferences')->get('listPageSize', 50)->data;
+        $page       = (int)$request->get('page');
+        $pageSize   = (int)app('preferences')->get('listPageSize', 50)->data;
         $limits     = $this->getLimits($budget, $allStart, $allEnd);
         $repetition = null;
         $attachments = $this->repository->getAttachments($budget);
@@ -168,9 +168,9 @@ 
         $groups = $collector->getPaginatedGroups();
         $groups->setPath(route('budgets.show', [$budget->id]));
 
-        $subTitle = (string) trans('firefly.all_journals_for_budget', ['name' => $budget->name]);
+        $subTitle = (string)trans('firefly.all_journals_for_budget', ['name' => $budget->name]);
 
-        return view('budgets.show', compact('limits','attachments', 'budget', 'repetition', 'groups', 'subTitle'));
+        return view('budgets.show', compact('limits', 'attachments', 'budget', 'repetition', 'groups', 'subTitle'));
     }
 
     /**
@@ -189,8 +189,8 @@ 
             throw new FireflyException('This budget limit is not part of this budget.'); // @codeCoverageIgnore
         }
 
-        $page     = (int) $request->get('page');
-        $pageSize = (int) app('preferences')->get('listPageSize', 50)->data;
+        $page     = (int)$request->get('page');
+        $pageSize = (int)app('preferences')->get('listPageSize', 50)->data;
         $subTitle = trans(
             'firefly.budget_in_period',
             [
@@ -215,6 +215,6 @@ 
         $attachments = $this->repository->getAttachments($budget);
         $limits = $this->getLimits($budget, $start, $end);
 
-        return view('budgets.show', compact('limits','attachments', 'budget', 'budgetLimit', 'groups', 'subTitle'));
+        return view('budgets.show', compact('limits', 'attachments', 'budget', 'budgetLimit', 'groups', 'subTitle'));
     }
 }

app/Http/Controllers/Category/NoCategoryController.php

Spacing +8 added lines, -8 removed lines

@@ -57,8 +57,8 @@ 
         app('view')->share('showBudget', true);
 
         $this->middleware(
-            function ($request, $next) {
-                app('view')->share('title', (string) trans('firefly.categories'));
+            function($request, $next) {
+                app('view')->share('title', (string)trans('firefly.categories'));
                 app('view')->share('mainTitleIcon', 'fa-bookmark');
                 $this->journalRepos = app(JournalRepositoryInterface::class);
 
@@ -83,13 +83,13 @@ 
         $start = $start ?? session('start');
         /** @var Carbon $end */
         $end      = $end ?? session('end');
-        $page     = (int) $request->get('page');
-        $pageSize = (int) app('preferences')->get('listPageSize', 50)->data;
+        $page     = (int)$request->get('page');
+        $pageSize = (int)app('preferences')->get('listPageSize', 50)->data;
         $subTitle = trans(
             'firefly.without_category_between',
             ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
         );
-        $periods  = $this->getNoCategoryPeriodOverview($start);
+        $periods = $this->getNoCategoryPeriodOverview($start);
 
         Log::debug(sprintf('Start for noCategory() is %s', $start->format('Y-m-d')));
         Log::debug(sprintf('End for noCategory() is %s', $end->format('Y-m-d')));
@@ -120,10 +120,10 @@ 
         $start    = null;
         $end      = null;
         $periods  = new Collection;
-        $page     = (int) $request->get('page');
-        $pageSize = (int) app('preferences')->get('listPageSize', 50)->data;
+        $page     = (int)$request->get('page');
+        $pageSize = (int)app('preferences')->get('listPageSize', 50)->data;
         Log::debug('Start of noCategory()');
-        $subTitle = (string) trans('firefly.all_journals_without_category');
+        $subTitle = (string)trans('firefly.all_journals_without_category');
         $first    = $this->journalRepos->firstNull();
         $start    = null === $first ? new Carbon : $first->date;
         $end      = today(config('app.timezone'));

app/Http/Controllers/Category/ShowController.php

Spacing +11 added lines, -11 removed lines

@@ -56,8 +56,8 @@ 
         app('view')->share('showBudget', true);
 
         $this->middleware(
-            function ($request, $next) {
-                app('view')->share('title', (string) trans('firefly.categories'));
+            function($request, $next) {
+                app('view')->share('title', (string)trans('firefly.categories'));
                 app('view')->share('mainTitleIcon', 'fa-bookmark');
                 $this->repository = app(CategoryRepositoryInterface::class);
 
@@ -84,16 +84,16 @@ 
         /** @var Carbon $end */
         $end          = $end ?? session('end', Carbon::now()->endOfMonth());
         $subTitleIcon = 'fa-bookmark';
-        $page         = (int) $request->get('page');
+        $page         = (int)$request->get('page');
         $attachments  = $this->repository->getAttachments($category);
-        $pageSize     = (int) app('preferences')->get('listPageSize', 50)->data;
+        $pageSize     = (int)app('preferences')->get('listPageSize', 50)->data;
         $oldest       = $this->repository->firstUseDate($category) ?? Carbon::now()->startOfYear();
         $periods      = $this->getCategoryPeriodOverview($category, $oldest, $end);
         $path         = route('categories.show', [$category->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
         $subTitle     = trans(
             'firefly.journals_in_period_for_category',
             ['name' => $category->name, 'start' => $start->formatLocalized($this->monthAndDayFormat),
-             'end'  => $end->formatLocalized($this->monthAndDayFormat),]
+             'end'  => $end->formatLocalized($this->monthAndDayFormat), ]
         );
 
         /** @var GroupCollectorInterface $collector */
@@ -105,7 +105,7 @@ 
         $groups = $collector->getPaginatedGroups();
         $groups->setPath($path);
 
-        return view('categories.show', compact('category','attachments', 'groups', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
+        return view('categories.show', compact('category', 'attachments', 'groups', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
     }
 
     /**
@@ -120,19 +120,19 @@ 
     {
         // default values:
         $subTitleIcon = 'fa-bookmark';
-        $page         = (int) $request->get('page');
-        $pageSize     = (int) app('preferences')->get('listPageSize', 50)->data;
+        $page         = (int)$request->get('page');
+        $pageSize     = (int)app('preferences')->get('listPageSize', 50)->data;
         $start        = null;
         $end          = null;
         $periods      = new Collection;
 
-        $subTitle = (string) trans('firefly.all_journals_for_category', ['name' => $category->name]);
+        $subTitle = (string)trans('firefly.all_journals_for_category', ['name' => $category->name]);
         $first    = $this->repository->firstUseDate($category);
         /** @var Carbon $start */
         $start = $first ?? today(config('app.timezone'));
         $end   = today(config('app.timezone'));
         $path  = route('categories.show.all', [$category->id]);
-        $attachments  = $this->repository->getAttachments($category);
+        $attachments = $this->repository->getAttachments($category);
 
         /** @var GroupCollectorInterface $collector */
         $collector = app(GroupCollectorInterface::class);
@@ -143,6 +143,6 @@ 
         $groups = $collector->getPaginatedGroups();
         $groups->setPath($path);
 
-        return view('categories.show', compact('category','attachments', 'groups', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
+        return view('categories.show', compact('category', 'attachments', 'groups', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
     }
 }