Small php fixes.

app/Api/V1/Controllers/Chart/BalanceController.php

@@ -31,9 +31,7 @@ use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Http\Api\AccountBalanceGrouped;
 use FireflyIII\Support\Http\Api\CleansChartData;
 use FireflyIII\Support\Http\Api\CollectsAccountsFromFilter;

app/Api/V1/Controllers/Chart/BudgetController.php

@@ -114,7 +114,7 @@ class BudgetController extends Controller
         // get all limits:
         $limits     = $this->blRepository->getBudgetLimits($budget, $start, $end);
         $rows       = [];
-        $spent      = $this->opsRepository->listExpenses($start, $end, null, new Collection([$budget]));
+        $spent      = $this->opsRepository->listExpenses($start, $end, null, new Collection()->push($budget));
         $expenses   = $this->processExpenses($budget->id, $spent, $start, $end);
         $converter  = new ExchangeRateConverter();
         $currencies = [$this->primaryCurrency->id => $this->primaryCurrency];
@@ -208,7 +208,7 @@ class BudgetController extends Controller
     //     */
     //    private function noBudgetLimits(Budget $budget, Carbon $start, Carbon $end): array
     //    {
-    //        $spent = $this->opsRepository->listExpenses($start, $end, null, new Collection([$budget]));
+    //        $spent = $this->opsRepository->listExpenses($start, $end, null, new Collection()->push($budget));
     //
     //        return $this->processExpenses($budget->id, $spent, $start, $end);
     //    }
@@ -290,7 +290,7 @@ class BudgetController extends Controller
     //        Log::debug(sprintf('Created new ExchangeRateConverter in %s', __METHOD__));
     //        $end             = clone $limit->end_date;
     //        $end->endOfDay();
-    //        $spent           = $this->opsRepository->listExpenses($limit->start_date, $end, null, new Collection([$budget]));
+    //        $spent           = $this->opsRepository->listExpenses($limit->start_date, $end, null, new Collection()->push($budget));
     //        $limitCurrencyId = $limit->transaction_currency_id;
     //
     //        /** @var array $entry */

app/Api/V1/Controllers/Controller.php

@@ -232,8 +232,6 @@ abstract class Controller extends BaseController
         $baseUrl  = sprintf('%s/api/v1', request()->getSchemeAndHttpHost());
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        // $transformer->collectMetaData(new Collection([$object]));
-
         $resource = new Item($object, $transformer, $key);
 
         return $manager->createData($resource)->toArray();

app/Api/V1/Controllers/Insight/Expense/BudgetController.php

@@ -76,7 +76,7 @@ class BudgetController extends Controller
 
         /** @var Budget $budget */
         foreach ($budgets as $budget) {
-            $expenses = $this->opsRepository->sumExpenses($start, $end, $assetAccounts, new Collection([$budget]));
+            $expenses = $this->opsRepository->sumExpenses($start, $end, $assetAccounts, new Collection()->push($budget));
 
             /** @var array $expense */
             foreach ($expenses as $expense) {

app/Api/V1/Controllers/Insight/Expense/CategoryController.php

@@ -76,7 +76,7 @@ class CategoryController extends Controller
 
         /** @var Category $category */
         foreach ($categories as $category) {
-            $expenses = $this->opsRepository->sumExpenses($start, $end, $assetAccounts, new Collection([$category]));
+            $expenses = $this->opsRepository->sumExpenses($start, $end, $assetAccounts, new Collection()->push($category));
 
             /** @var array $expense */
             foreach ($expenses as $expense) {

app/Api/V1/Controllers/Insight/Income/CategoryController.php

@@ -76,7 +76,7 @@ class CategoryController extends Controller
 
         /** @var Category $category */
         foreach ($categories as $category) {
-            $expenses = $this->opsRepository->sumIncome($start, $end, $assetAccounts, new Collection([$category]));
+            $expenses = $this->opsRepository->sumIncome($start, $end, $assetAccounts, new Collection()->push($category));
 
             /** @var array $expense */
             foreach ($expenses as $expense) {

app/Api/V1/Controllers/Insight/Transfer/CategoryController.php

@@ -76,7 +76,7 @@ class CategoryController extends Controller
 
         /** @var Category $category */
         foreach ($categories as $category) {
-            $expenses = $this->opsRepository->sumTransfers($start, $end, $assetAccounts, new Collection([$category]));
+            $expenses = $this->opsRepository->sumTransfers($start, $end, $assetAccounts, new Collection()->push($category));
 
             /** @var array $expense */
             foreach ($expenses as $expense) {

app/Api/V1/Controllers/Models/Account/ListController.php

@@ -152,7 +152,7 @@ class ListController extends Controller
         // use new group collector:
         /** @var GroupCollectorInterface $collector */
         $collector    = app(GroupCollectorInterface::class);
-        $collector->setUser($admin)->setAccounts(new Collection([$account]))
+        $collector->setUser($admin)->setAccounts(new Collection()->push($account))
             ->withAPIInformation()->setLimit($pageSize)->setPage($this->parameters->get('page'))->setTypes($types)
         ;
 

app/Api/V1/Controllers/Models/Rule/TriggerController.php

@@ -75,7 +75,7 @@ class TriggerController extends Controller
 
         /** @var RuleEngineInterface $ruleEngine */
         $ruleEngine   = app(RuleEngineInterface::class);
-        $ruleEngine->setRules(new Collection([$rule]));
+        $ruleEngine->setRules(new Collection()->push($rule));
 
         // overrule the rule(s) if necessary.
         if (array_key_exists('start', $parameters) && null !== $parameters['start']) {
@@ -129,7 +129,7 @@ class TriggerController extends Controller
 
         /** @var RuleEngineInterface $ruleEngine */
         $ruleEngine = app(RuleEngineInterface::class);
-        $ruleEngine->setRules(new Collection([$rule]));
+        $ruleEngine->setRules(new Collection()->push($rule));
 
         // overrule the rule(s) if necessary.
         if (array_key_exists('start', $parameters) && null !== $parameters['start']) {

app/Api/V1/Controllers/System/ConfigurationController.php

@@ -133,7 +133,6 @@ class ConfigurationController extends Controller
      */
     public function show(string $configKey): JsonResponse
     {
-        $data     = [];
         $dynamic  = $this->getDynamicConfiguration();
         $shortKey = str_replace('configuration.', '', $configKey);
         if (str_starts_with($configKey, 'configuration.')) {

app/Api/V1/Controllers/Webhook/ShowController.php

@@ -165,9 +165,9 @@ class ShowController extends Controller
         // tell the generator which trigger it should look for
         $engine->setTrigger(WebhookTrigger::tryFrom($webhook->trigger));
         // tell the generator which objects to process
-        $engine->setObjects(new Collection([$group]));
+        $engine->setObjects(new Collection()->push($group));
         // set the webhook to trigger
-        $engine->setWebhooks(new Collection([$webhook]));
+        $engine->setWebhooks(new Collection()->push($webhook));
         // tell the generator to generate the messages
         $engine->generateMessages();
 

app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByCurrenciesRequest.php

@@ -58,8 +58,8 @@ class StoreByCurrenciesRequest extends FormRequest
                 $data = $validator->getData();
                 foreach ($data as $date => $rate) {
                     try {
-                        $date = Carbon::createFromFormat('Y-m-d', $date);
-                    } catch (InvalidFormatException $e) {
+                        Carbon::createFromFormat('Y-m-d', $date);
+                    } catch (InvalidFormatException) {
                         $validator->errors()->add('date', trans('validation.date', ['attribute' => 'date']));
 
                         return;

app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByDateRequest.php

@@ -88,7 +88,7 @@ class StoreByDateRequest extends FormRequest
                     }
 
                     try {
-                        $to = Amount::getTransactionCurrencyByCode((string)$key);
+                        Amount::getTransactionCurrencyByCode((string)$key);
                     } catch (FireflyException) {
                         $validator->errors()->add(sprintf('rates.%s', $key), trans('validation.invalid_currency_code', ['code' => $key]));
                     }

app/Console/Commands/Correction/CorrectsPiggyBanks.php

@@ -57,8 +57,6 @@ class CorrectsPiggyBanks extends Command
                 $event->transaction_journal_id = null;
                 $event->save();
                 ++$count;
-
-                continue;
             }
         }
         if (0 !== $count) {

app/Console/Commands/Correction/RestoresOAuthKeys.php

@@ -71,7 +71,6 @@ class RestoresOAuthKeys extends Command
             $this->storeKeysInDB();
             $this->friendlyInfo('Stored OAuth keys in database.');
 
-            return;
         }
     }
 

app/Console/Commands/System/ForcesDecimalSize.php

@@ -515,7 +515,7 @@ class ForcesDecimalSize extends Command
                 continue;
             }
             // fix $field by rounding it down correctly.
-            $pow         = (float) 10 ** $currency->decimal_places;
+            $pow         = 10.0 ** $currency->decimal_places;
             $correct     = bcdiv((string) round((float) $value * $pow), (string) $pow, 12);
             $this->friendlyWarning(sprintf('Transaction #%d has amount with value "%s", this has been corrected to "%s".', $item->id, $value, $correct));
 
@@ -546,7 +546,7 @@ class ForcesDecimalSize extends Command
                 continue;
             }
             // fix $field by rounding it down correctly.
-            $pow         = (float) 10 ** $currency->decimal_places;
+            $pow         = 10.0 ** $currency->decimal_places;
             $correct     = bcdiv((string) round((float) $value * $pow), (string) $pow, 12);
             $this->friendlyWarning(
                 sprintf('Transaction #%d has foreign amount with value "%s", this has been corrected to "%s".', $item->id, $value, $correct)

app/Console/Commands/Upgrade/UpgradesLiabilitiesEight.php

@@ -157,7 +157,6 @@ class UpgradesLiabilitiesEight extends Command
             $service = new TransactionGroupDestroyService();
             $service->destroy($group);
 
-            return;
         }
     }
 

app/Exceptions/GracefulNotFoundHandler.php

@@ -128,10 +128,6 @@ class GracefulNotFoundHandler extends ExceptionHandler
                 return redirect(route('categories.index'));
 
             case 'rules.edit':
-                $request->session()->reflash();
-
-                return redirect(route('rules.index'));
-
             case 'rule-groups.edit':
                 $request->session()->reflash();
 

app/Factory/TransactionJournalFactory.php

@@ -270,7 +270,7 @@ class TransactionJournalFactory
             $negative = $transactionFactory->createNegative((string) $row['amount'], (string) $row['foreign_amount']);
         } catch (FireflyException $e) {
             Log::error(sprintf('Exception creating negative transaction: %s', $e->getMessage()));
-            $this->forceDeleteOnError(new Collection([$journal]));
+            $this->forceDeleteOnError(new Collection()->push($journal));
 
             throw new FireflyException($e->getMessage(), 0, $e);
         }
@@ -305,7 +305,7 @@ class TransactionJournalFactory
         } catch (FireflyException $e) {
             Log::error(sprintf('Exception creating positive transaction: %s', $e->getMessage()));
             $this->forceTrDelete($negative);
-            $this->forceDeleteOnError(new Collection([$journal]));
+            $this->forceDeleteOnError(new Collection()->push($journal));
 
             throw new FireflyException($e->getMessage(), 0, $e);
         }

app/Generator/Report/Audit/MonthReportGenerator.php

@@ -132,7 +132,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
 
         /** @var GroupCollectorInterface $collector */
         $collector         = app(GroupCollectorInterface::class);
-        $collector->setAccounts(new Collection([$account]))->setRange($this->start, $this->end)->withAccountInformation()
+        $collector->setAccounts(new Collection()->push($account))->setRange($this->start, $this->end)->withAccountInformation()
             ->withBudgetInformation()->withCategoryInformation()->withBillInformation()->withNotes()
         ;
         $journals          = $collector->getExtractedJournals();

app/Handlers/Events/DestroyedGroupEventHandler.php

@@ -52,7 +52,7 @@ class DestroyedGroupEventHandler
         /** @var MessageGeneratorInterface $engine */
         $engine = app(MessageGeneratorInterface::class);
         $engine->setUser($user);
-        $engine->setObjects(new Collection([$group]));
+        $engine->setObjects(new Collection()->push($group));
         $engine->setTrigger(WebhookTrigger::DESTROY_TRANSACTION);
         $engine->generateMessages();
         Log::debug(sprintf('send event RequestedSendWebhookMessages from %s', __METHOD__));

app/Handlers/Events/StoredGroupEventHandler.php

@@ -116,7 +116,7 @@ class StoredGroupEventHandler
         // tell the generator which trigger it should look for
         $engine->setTrigger(WebhookTrigger::STORE_TRANSACTION);
         // tell the generator which objects to process
-        $engine->setObjects(new Collection([$group]));
+        $engine->setObjects(new Collection()->push($group));
         // tell the generator to generate the messages
         $engine->generateMessages();
 

app/Handlers/Events/UpdatedGroupEventHandler.php

@@ -163,7 +163,7 @@ class UpdatedGroupEventHandler
         /** @var MessageGeneratorInterface $engine */
         $engine = app(MessageGeneratorInterface::class);
         $engine->setUser($user);
-        $engine->setObjects(new Collection([$group]));
+        $engine->setObjects(new Collection()->push($group));
         $engine->setTrigger(WebhookTrigger::UPDATE_TRANSACTION);
         $engine->generateMessages();
 

app/Helpers/Collector/Extensions/MetaCollection.php

@@ -762,7 +762,7 @@ trait MetaCollection
     public function setTag(Tag $tag): GroupCollectorInterface
     {
         $this->withTagInformation();
-        $this->setTags(new Collection([$tag]));
+        $this->setTags(new Collection()->push($tag));
 
         return $this;
     }

app/Helpers/Collector/GroupCollector.php

@@ -560,7 +560,7 @@ class GroupCollector implements GroupCollectorInterface
         }
         $groups = $this->parseSums($groups);
 
-        return new Collection($groups);
+        return new Collection()->push(...$groups);
     }
 
     /**

app/Helpers/Report/NetWorth.php

@@ -49,7 +49,6 @@ use Illuminate\Support\Facades\Log;
 class NetWorth implements NetWorthInterface
 {
     private AccountRepositoryInterface  $accountRepository;
-    private CurrencyRepositoryInterface $currencyRepos;
     private User                        $user;             // @phpstan-ignore-line
     private ?UserGroup                  $userGroup = null;
 
@@ -131,8 +130,6 @@ class NetWorth implements NetWorthInterface
         $this->accountRepository = app(AccountRepositoryInterface::class);
         $this->accountRepository->setUserGroup($userGroup);
 
-        $this->currencyRepos     = app(CurrencyRepositoryInterface::class);
-        $this->currencyRepos->setUserGroup($this->userGroup);
     }
 
     #[Deprecated]

app/Helpers/Report/PopupReport.php

@@ -45,7 +45,7 @@ class PopupReport implements PopupReportInterface
     {
         /** @var GroupCollectorInterface $collector */
         $collector = app(GroupCollectorInterface::class);
-        $collector->setAccounts(new Collection([$account]))
+        $collector->setAccounts(new Collection()->push($account))
             ->withAccountInformation()
             ->withBudgetInformation()
             ->withCategoryInformation()
@@ -72,7 +72,7 @@ class PopupReport implements PopupReportInterface
         /** @var GroupCollectorInterface $collector */
         $collector  = app(GroupCollectorInterface::class);
         $collector
-            ->setAccounts(new Collection([$account]))
+            ->setAccounts(new Collection()->push($account))
             ->setTypes([TransactionTypeEnum::WITHDRAWAL->value])
             ->withAccountInformation()
             ->withCategoryInformation()
@@ -191,7 +191,7 @@ class PopupReport implements PopupReportInterface
         // $set = $attributes['accounts'] ?? new Collection;
         // $set->push($account);
 
-        $collector->setDestinationAccounts(new Collection([$account]))
+        $collector->setDestinationAccounts(new Collection()->push($account))
             ->setRange($attributes['startDate'], $attributes['endDate'])
             ->withAccountInformation()
             ->withBudgetInformation()
@@ -218,7 +218,7 @@ class PopupReport implements PopupReportInterface
         /** @var GroupCollectorInterface $collector */
         $collector  = app(GroupCollectorInterface::class);
         $collector
-            ->setSourceAccounts(new Collection([$account]))
+            ->setSourceAccounts(new Collection()->push($account))
             ->setDestinationAccounts($attributes['accounts'])
             ->setRange($attributes['startDate'], $attributes['endDate'])
             ->setTypes([TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::TRANSFER->value])

app/Http/Controllers/Account/CreateController.php

@@ -86,7 +86,7 @@ class CreateController extends Controller
                 'latitude'     => $hasOldInput ? old('location_latitude') : config('firefly.default_location.latitude'),
                 'longitude'    => $hasOldInput ? old('location_longitude') : config('firefly.default_location.longitude'),
                 'zoom_level'   => $hasOldInput ? old('location_zoom_level') : config('firefly.default_location.zoom_level'),
-                'has_location' => $hasOldInput ? 'true' === old('location_has_location') : false,
+                'has_location' => $hasOldInput && 'true' === old('location_has_location'),
             ],
         ];
         $liabilityDirections = [
@@ -106,7 +106,7 @@ class CreateController extends Controller
             'preFilled',
             [
                 'currency_id'       => $this->primaryCurrency->id,
-                'include_net_worth' => $hasOldInput ? (bool) $request->old('include_net_worth') : true,
+                'include_net_worth' => !$hasOldInput || (bool)$request->old('include_net_worth'),
             ]
         );
         // issue #8321

app/Http/Controllers/Account/ShowController.php

@@ -143,7 +143,7 @@ class ShowController extends Controller
         /** @var GroupCollectorInterface $collector */
         $collector        = app(GroupCollectorInterface::class);
         $collector
-            ->setAccounts(new Collection([$account]))
+            ->setAccounts(new Collection()->push($account))
             ->setLimit($pageSize)
             ->setPage($page)
             ->withAttachmentInformation()
@@ -221,7 +221,7 @@ class ShowController extends Controller
 
         /** @var GroupCollectorInterface $collector */
         $collector       = app(GroupCollectorInterface::class);
-        $collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page)->withAccountInformation()->withCategoryInformation();
+        $collector->setAccounts(new Collection()->push($account))->setLimit($pageSize)->setPage($page)->withAccountInformation()->withCategoryInformation();
 
         // this search will not include transaction groups where this asset account (or liability)
         // is just part of ONE of the journals. To force this:

app/Http/Controllers/Budget/BudgetLimitController.php

@@ -203,7 +203,7 @@ class BudgetLimitController extends Controller
         if ($request->expectsJson()) {
             $array                           = $limit->toArray();
             // add some extra metadata:
-            $spentArr                        = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection([$budget]), $currency);
+            $spentArr                        = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection()->push($budget), $currency);
             $array['spent']                  = $spentArr[$currency->id]['sum'] ?? '0';
             $array['left_formatted']         = app('amount')->formatAnything($limit->transactionCurrency, bcadd($array['spent'], (string) $array['amount']));
             $array['amount_formatted']       = app('amount')->formatAnything($limit->transactionCurrency, $limit['amount']);
@@ -264,7 +264,7 @@ class BudgetLimitController extends Controller
             $limit->start_date,
             $limit->end_date,
             null,
-            new Collection([$budgetLimit->budget]),
+            new Collection()->push($budgetLimit->budget),
             $budgetLimit->transactionCurrency
         );
         $daysLeft                        = $this->activeDaysLeft($limit->start_date, $limit->end_date);

app/Http/Controllers/Budget/IndexController.php

@@ -235,7 +235,7 @@ class IndexController extends Controller
 
             /** @var TransactionCurrency $currency */
             foreach ($currencies as $currency) {
-                $spentArr = $this->opsRepository->sumExpenses($start, $end, null, new Collection([$current]), $currency, false);
+                $spentArr = $this->opsRepository->sumExpenses($start, $end, null, new Collection()->push($current), $currency, false);
                 if (array_key_exists($currency->id, $spentArr) && array_key_exists('sum', $spentArr[$currency->id])) {
                     $array['spent'][$currency->id]['spent']                   = $spentArr[$currency->id]['sum'];
                     $array['spent'][$currency->id]['currency_id']             = $currency->id;

app/Http/Controllers/Chart/AccountController.php

@@ -235,7 +235,7 @@ class AccountController extends Controller
 
         /** @var GroupCollectorInterface $collector */
         $collector = app(GroupCollectorInterface::class);
-        $collector->setAccounts(new Collection([$account]))
+        $collector->setAccounts(new Collection()->push($account))
             ->setRange($start, $end)
             ->withBudgetInformation()->setTypes([TransactionTypeEnum::WITHDRAWAL->value])
         ;
@@ -322,7 +322,7 @@ class AccountController extends Controller
 
         /** @var GroupCollectorInterface $collector */
         $collector = app(GroupCollectorInterface::class);
-        $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->withCategoryInformation()->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);
+        $collector->setAccounts(new Collection()->push($account))->setRange($start, $end)->withCategoryInformation()->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);
         $journals  = $collector->getExtractedJournals();
         $result    = [];
         $chartData = [];
@@ -429,7 +429,7 @@ class AccountController extends Controller
         /** @var GroupCollectorInterface $collector */
         $collector = app(GroupCollectorInterface::class);
 
-        $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->withCategoryInformation()->setTypes([TransactionTypeEnum::DEPOSIT->value]);
+        $collector->setAccounts(new Collection()->push($account))->setRange($start, $end)->withCategoryInformation()->setTypes([TransactionTypeEnum::DEPOSIT->value]);
         $journals  = $collector->getExtractedJournals();
         $result    = [];
         $chartData = [];

app/Http/Controllers/Chart/BudgetController.php

@@ -100,7 +100,7 @@ class BudgetController extends Controller
             return response()->json($cache->get());
         }
         $step           = $this->calculateStep($start, $end); // depending on diff, do something with range of chart.
-        $collection     = new Collection([$budget]);
+        $collection     = new Collection()->push($budget);
         $chartData      = [];
         $loopStart      = clone $start;
         $loopStart      = Navigation::startOfPeriod($loopStart, $step);
@@ -169,7 +169,7 @@ class BudgetController extends Controller
         $locale                                 = app('steam')->getLocale();
         $entries                                = [];
         $amount                                 = $budgetLimit->amount ?? '0';
-        $budgetCollection                       = new Collection([$budget]);
+        $budgetCollection                       = new Collection()->push($budget);
         $currency                               = $budgetLimit->transactionCurrency;
         if ($this->convertToPrimary) {
             $amount   = $budgetLimit->native_amount ?? $amount;
@@ -535,7 +535,7 @@ class BudgetController extends Controller
             }
 
             // get spent amount in this period for this currency.
-            $sum                             = $this->opsRepository->sumExpenses($currentStart, $currentEnd, $accounts, new Collection([$budget]), $currency);
+            $sum                             = $this->opsRepository->sumExpenses($currentStart, $currentEnd, $accounts, new Collection()->push($budget), $currency);
             $amount                          = app('steam')->positive($sum[$currency->id]['sum'] ?? '0');
             $chartData[0]['entries'][$title] = app('steam')->bcround($amount, $currency->decimal_places);
 

app/Http/Controllers/Chart/BudgetReportController.php

@@ -163,7 +163,7 @@ class BudgetReportController extends Controller
     public function mainChart(Collection $accounts, Budget $budget, Carbon $start, Carbon $end): JsonResponse
     {
         $chartData = [];
-        $spent     = $this->opsRepository->listExpenses($start, $end, $accounts, new Collection([$budget]));
+        $spent     = $this->opsRepository->listExpenses($start, $end, $accounts, new Collection()->push($budget));
         $format    = Navigation::preferredCarbonLocalizedFormat($start, $end);
 
         // loop expenses.

app/Http/Controllers/Chart/CategoryController.php

@@ -174,7 +174,7 @@ class CategoryController extends Controller
             $opsRepository = app(OperationsRepositoryInterface::class);
             $categoryId    = $category->id;
             // this gives us all currencies
-            $collection    = new Collection([$category]);
+            $collection    = new Collection()->push($category);
             $expenses      = $opsRepository->listExpenses($start, $end, $accounts, $collection);
             $income        = $opsRepository->listIncome($start, $end, $accounts, $collection);
         }

app/Http/Controllers/Chart/CategoryReportController.php

@@ -208,8 +208,8 @@ class CategoryReportController extends Controller
     public function mainChart(Collection $accounts, Category $category, Carbon $start, Carbon $end): JsonResponse
     {
         $chartData = [];
-        $spent     = $this->opsRepository->listExpenses($start, $end, $accounts, new Collection([$category]));
-        $earned    = $this->opsRepository->listIncome($start, $end, $accounts, new Collection([$category]));
+        $spent     = $this->opsRepository->listExpenses($start, $end, $accounts, new Collection()->push($category));
+        $earned    = $this->opsRepository->listIncome($start, $end, $accounts, new Collection()->push($category));
         $format    = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
         // loop expenses.
         foreach ($spent as $currency) {

app/Http/Controllers/Chart/DoubleReportController.php

@@ -150,7 +150,7 @@ class DoubleReportController extends Controller
     {
         $chartData = [];
 
-        $opposing  = $this->repository->expandWithDoubles(new Collection([$account]));
+        $opposing  = $this->repository->expandWithDoubles(new Collection()->push($account));
         $accounts  = $accounts->merge($opposing);
         $spent     = $this->opsRepository->listExpenses($start, $end, $accounts);
         $earned    = $this->opsRepository->listIncome($start, $end, $accounts);

app/Http/Controllers/Chart/TagReportController.php

@@ -212,8 +212,8 @@ class TagReportController extends Controller
     public function mainChart(Collection $accounts, Tag $tag, Carbon $start, Carbon $end): JsonResponse
     {
         $chartData = [];
-        $spent     = $this->opsRepository->listExpenses($start, $end, $accounts, new Collection([$tag]));
-        $earned    = $this->opsRepository->listIncome($start, $end, $accounts, new Collection([$tag]));
+        $spent     = $this->opsRepository->listExpenses($start, $end, $accounts, new Collection()->push($tag));
+        $earned    = $this->opsRepository->listIncome($start, $end, $accounts, new Collection()->push($tag));
         $format    = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
 
         // loop expenses.

app/Http/Controllers/HomeController.php

@@ -170,7 +170,7 @@ class HomeController extends Controller
         foreach ($accounts as $account) {
             /** @var GroupCollectorInterface $collector */
             $collector      = app(GroupCollectorInterface::class);
-            $collector->setAccounts(new Collection([$account]))->withAccountInformation()->setRange($start, $end)->setLimit(10)->setPage(1);
+            $collector->setAccounts(new Collection()->push($account))->withAccountInformation()->setRange($start, $end)->setLimit(10)->setPage(1);
             $set            = $collector->getExtractedJournals();
             $transactions[] = ['transactions' => $set, 'account' => $account];
         }

app/Http/Controllers/Json/BoxController.php

@@ -171,7 +171,7 @@ class BoxController extends Controller
         $filtered          = $allAccounts->filter(
             static function (Account $account) use ($accountRepository) {
                 $includeNetWorth = $accountRepository->getMetaValue($account, 'include_net_worth');
-                $result          = null === $includeNetWorth ? true : '1' === $includeNetWorth;
+                $result          = null === $includeNetWorth || '1' === $includeNetWorth;
                 if (false === $result) {
                     app('log')->debug(sprintf('Will not include "%s" in net worth charts.', $account->name));
                 }

app/Http/Controllers/Json/ReconcileController.php

@@ -217,7 +217,7 @@ class ReconcileController extends Controller
         /** @var GroupCollectorInterface $collector */
         $collector      = app(GroupCollectorInterface::class);
 
-        $collector->setAccounts(new Collection([$account]))
+        $collector->setAccounts(new Collection()->push($account))
             ->setRange($selectionStart, $selectionEnd)
             ->withBudgetInformation()->withCategoryInformation()->withAccountInformation()
         ;

app/Http/Controllers/Recurring/TriggerController.php

@@ -74,7 +74,7 @@ class TriggerController extends Controller
 
         /** @var CreateRecurringTransactions $job */
         $job                        = app(CreateRecurringTransactions::class);
-        $job->setRecurrences(new Collection([$recurrence]));
+        $job->setRecurrences(new Collection()->push($recurrence));
         $job->setDate($date);
         $job->setForce(false);
         $job->handle();

app/Http/Controllers/Report/BudgetController.php

@@ -291,7 +291,7 @@ class BudgetController extends Controller
         $cache->addProperty('budget-period-report');
         $cache->addProperty($accounts->pluck('id')->toArray());
         if ($cache->has()) {
-            // return $cache->get();
+             return $cache->get();
         }
 
         $periods   = Navigation::listOfPeriods($start, $end);

app/Http/Controllers/Rule/SelectController.php

@@ -152,7 +152,7 @@ class SelectController extends Controller
         $newRuleEngine      = app(RuleEngineInterface::class);
 
         // set rules:
-        $newRuleEngine->setRules(new Collection([$rule]));
+        $newRuleEngine->setRules(new Collection()->push($rule));
         $newRuleEngine->setRefreshTriggers(false);
         $collection         = $newRuleEngine->find();
         $collection         = $collection->slice(0, 20);
@@ -196,7 +196,7 @@ class SelectController extends Controller
         $newRuleEngine = app(RuleEngineInterface::class);
 
         // set rules:
-        $newRuleEngine->setRules(new Collection([$rule]));
+        $newRuleEngine->setRules(new Collection()->push($rule));
         $collection    = $newRuleEngine->find();
         $collection    = $collection->slice(0, 20);
 

app/Http/Controllers/RuleGroup/ExecutionController.php

@@ -78,7 +78,7 @@ class ExecutionController extends Controller
 
         // set rules:
         // #10427, file rule group and not the set of rules.
-        $collection    = new Collection([$ruleGroup]);
+        $collection    = new Collection()->push($ruleGroup);
         $newRuleEngine->setRuleGroups($collection);
         $newRuleEngine->fire();
 

app/Jobs/CreateAutoBudgetLimits.php

@@ -269,7 +269,7 @@ class CreateAutoBudgetLimits implements ShouldQueue
         // if has one, calculate expenses and use that as a base.
         $repository    = app(OperationsRepositoryInterface::class);
         $repository->setUser($autoBudget->budget->user);
-        $spent         = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection([$autoBudget->budget]), $autoBudget->transactionCurrency);
+        $spent         = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);
         $currencyId    = $autoBudget->transaction_currency_id;
         $spentAmount   = $spent[$currencyId]['sum'] ?? '0';
         Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));
@@ -329,7 +329,7 @@ class CreateAutoBudgetLimits implements ShouldQueue
         // if has one, calculate expenses and use that as a base.
         $repository      = app(OperationsRepositoryInterface::class);
         $repository->setUser($autoBudget->budget->user);
-        $spent           = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection([$autoBudget->budget]), $autoBudget->transactionCurrency);
+        $spent           = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);
         $currencyId      = $autoBudget->transaction_currency_id;
         $spentAmount     = $spent[$currencyId]['sum'] ?? '0';
         Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));

app/Repositories/Budget/AvailableBudgetRepository.php

@@ -209,7 +209,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface, U
     #[Deprecated]
     public function setAvailableBudget(TransactionCurrency $currency, Carbon $start, Carbon $end, string $amount): AvailableBudget
     {
-        /** @var null|AvailableBudget */
+        /** @var AvailableBudget|null $availableBudget */
         $availableBudget         = $this->user->availableBudgets()
             ->where('transaction_currency_id', $currency->id)
             ->where('start_date', $start->format('Y-m-d'))

app/Rules/IsDuplicateTransaction.php

@@ -34,15 +34,12 @@ use Closure;
  */
 class IsDuplicateTransaction implements ValidationRule
 {
-    private string $value;
 
     /**
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function validate(string $attribute, mixed $value, Closure $fail): void
     {
-        $this->value = $value;
-
-        $fail($this->value);
+        $fail($value);
     }
 }

app/Services/Internal/Support/CreditRecalculateService.php

@@ -227,7 +227,6 @@ class CreditRecalculateService
             $source->save();
             $dest->save();
 
-            return;
         }
         // Log::debug('Opening balance is valid');
     }

app/Support/Calendar/Calculator.php

@@ -70,7 +70,7 @@ class Calculator
         }
         self::$intervalMap = new SplObjectStorage();
         foreach (Periodicity::cases() as $interval) {
-            $periodicityClass  = __NAMESPACE__."\\Periodicity\\{$interval->name}";
+            $periodicityClass  = sprintf('%s\\Periodicity\\%s',__NAMESPACE__,$interval->name);
             self::$intervals[] = $interval->name;
             self::$intervalMap->attach($interval, new $periodicityClass());
         }

app/Support/Chart/Budget/FrontpageChartGenerator.php

@@ -114,7 +114,7 @@ class FrontpageChartGenerator
      */
     private function noBudgetLimits(array $data, Budget $budget): array
     {
-        $spent = $this->opsRepository->sumExpenses($this->start, $this->end, null, new Collection([$budget]));
+        $spent = $this->opsRepository->sumExpenses($this->start, $this->end, null, new Collection()->push($budget));
 
         /** @var array $entry */
         foreach ($spent as $entry) {
@@ -158,7 +158,7 @@ class FrontpageChartGenerator
             Log::debug(sprintf('Processing limit #%d with %s %s', $limit->id, $limit->transactionCurrency->code, $limit->amount));
         }
 
-        $spent      = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection([$budget]), $currency);
+        $spent      = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection()->push($budget), $currency);
         Log::debug(sprintf('Spent array has %d entries.', count($spent)));
 
         /** @var array $entry */

app/Support/Chart/Category/WholePeriodChartGenerator.php

@@ -40,7 +40,7 @@ class WholePeriodChartGenerator
 
     public function generate(Category $category, Carbon $start, Carbon $end): array
     {
-        $collection        = new Collection([$category]);
+        $collection        = new Collection()->push($category);
 
         /** @var OperationsRepositoryInterface $opsRepository */
         $opsRepository     = app(OperationsRepositoryInterface::class);

app/Support/Http/Controllers/AugumentData.php

@@ -191,7 +191,7 @@ trait AugumentData
 
         $set              = $blRepository->getBudgetLimits($budget, $start, $end);
 
-        $budgetCollection = new Collection([$budget]);
+        $budgetCollection = new Collection()->push($budget);
 
         // merge sets based on a key, in case of convert to primary currency
         $limits           = new Collection();

app/Support/JsonApi/Enrichments/AccountEnrichment.php

@@ -90,7 +90,7 @@ class AccountEnrichment implements EnrichmentInterface
     public function enrichSingle(array|Model $model): Account|array
     {
         Log::debug(__METHOD__);
-        $collection = new Collection([$model]);
+        $collection = new Collection()->push($model);
         $collection = $this->enrich($collection);
 
         return $collection->first();

app/Support/JsonApi/Enrichments/BudgetEnrichment.php

@@ -73,7 +73,7 @@ class BudgetEnrichment implements EnrichmentInterface
     public function enrichSingle(array|Model $model): array|Model
     {
         Log::debug(__METHOD__);
-        $collection = new Collection([$model]);
+        $collection = new Collection()->push($model);
         $collection = $this->enrich($collection);
 
         return $collection->first();
@@ -167,7 +167,7 @@ class BudgetEnrichment implements EnrichmentInterface
             $opsRepository->setUser($this->user);
             $opsRepository->setUserGroup($this->userGroup);
             // $spent = $this->beautify();
-            // $set = $this->opsRepository->sumExpenses($start, $end, null, new Collection([$budget]))
+            // $set = $this->opsRepository->sumExpenses($start, $end, null, new Collection()->push($budget))
             $expenses      = $opsRepository->collectExpenses($this->start, $this->end, null, $this->collection, null);
             foreach ($this->collection as $item) {
                 $id                 = (int)$item->id;

app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php

@@ -47,7 +47,6 @@ class BudgetLimitEnrichment implements EnrichmentInterface
     private array               $notes            = [];
     private Carbon              $start;
     private Carbon              $end;
-    private Collection          $budgets;
     private array               $expenses         = [];
     private array               $pcExpenses       = [];
     private array               $currencyIds      = [];
@@ -147,11 +146,11 @@ class BudgetLimitEnrichment implements EnrichmentInterface
     private function collectBudgets(): void
     {
         $budgetIds     = $this->collection->pluck('budget_id')->unique()->toArray();
-        $this->budgets = Budget::whereIn('id', $budgetIds)->get();
+        $budgets = Budget::whereIn('id', $budgetIds)->get();
 
         $repository    = app(OperationsRepository::class);
         $repository->setUser($this->user);
-        $expenses      = $repository->collectExpenses($this->start, $this->end, null, $this->budgets, null);
+        $expenses      = $repository->collectExpenses($this->start, $this->end, null, $budgets, null);
 
         /** @var BudgetLimit $budgetLimit */
         foreach ($this->collection as $budgetLimit) {

app/Support/JsonApi/Enrichments/CategoryEnrichment.php

@@ -65,7 +65,7 @@ class CategoryEnrichment implements EnrichmentInterface
     public function enrichSingle(array|Model $model): array|Model
     {
         Log::debug(__METHOD__);
-        $collection = new Collection([$model]);
+        $collection = new Collection()->push($model);
         $collection = $this->enrich($collection);
 
         return $collection->first();

app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php

@@ -80,7 +80,7 @@ class PiggyBankEnrichment implements EnrichmentInterface
     public function enrichSingle(array|Model $model): array|Model
     {
         Log::debug(__METHOD__);
-        $collection = new Collection([$model]);
+        $collection = new Collection()->push($model);
         $collection = $this->enrich($collection);
 
         return $collection->first();

app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php

@@ -69,7 +69,7 @@ class PiggyBankEventEnrichment implements EnrichmentInterface
     public function enrichSingle(array|Model $model): array|Model
     {
         Log::debug(__METHOD__);
-        $collection = new Collection([$model]);
+        $collection = new Collection()->push($model);
         $collection = $this->enrich($collection);
 
         return $collection->first();

app/Support/JsonApi/Enrichments/RecurringEnrichment.php

@@ -101,7 +101,7 @@ class RecurringEnrichment implements EnrichmentInterface
     public function enrichSingle(array|Model $model): array|Model
     {
         Log::debug(__METHOD__);
-        $collection = new Collection([$model]);
+        $collection = new Collection()->push($model);
         $collection = $this->enrich($collection);
 
         return $collection->first();

app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php

@@ -145,7 +145,7 @@ class SubscriptionEnrichment implements EnrichmentInterface
     public function enrichSingle(array|Model $model): array|Model
     {
         Log::debug(__METHOD__);
-        $collection = new Collection([$model]);
+        $collection = new Collection()->push($model);
         $collection = $this->enrich($collection);
 
         return $collection->first();

app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php

@@ -68,7 +68,7 @@ class TransactionGroupEnrichment implements EnrichmentInterface
     {
         Log::debug(__METHOD__);
         if (is_array($model)) {
-            $collection = new Collection([$model]);
+            $collection = new Collection()->push($model);
             $collection = $this->enrich($collection);
 
             return $collection->first();

app/Support/JsonApi/Enrichments/WebhookEnrichment.php

@@ -70,7 +70,7 @@ class WebhookEnrichment implements EnrichmentInterface
     public function enrichSingle(array|Model $model): array|Model
     {
         Log::debug(__METHOD__);
-        $collection = new Collection([$model]);
+        $collection = new Collection()->push($model);
         $collection = $this->enrich($collection);
 
         return $collection->first();

app/Support/Models/AccountBalanceCalculator.php

@@ -206,7 +206,7 @@ class AccountBalanceCalculator
         foreach ($transactionJournal->transactions as $transaction) {
             $set[$transaction->account_id] = $transaction->account;
         }
-        $accounts = new Collection($set);
+        $accounts = new Collection()->push(...$set);
         $object->optimizedCalculation($accounts, $transactionJournal->date);
     }
 }

app/Support/Report/Budget/BudgetReportGenerator.php

@@ -188,7 +188,7 @@ class BudgetReportGenerator
         $limitId                                        = $limit->id;
         $limitCurrency                                  = $limit->transactionCurrency ?? $this->currency;
         $currencyId                                     = $limitCurrency->id;
-        $expenses                                       = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, $this->accounts, new Collection([$budget]));
+        $expenses                                       = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, $this->accounts, new Collection()->push($budget));
         $spent                                          = $expenses[$currencyId]['sum'] ?? '0';
         $left                                           = -1 === bccomp(bcadd($limit->amount, $spent), '0') ? '0' : bcadd($limit->amount, $spent);
         $overspent                                      = 1 === bccomp(bcmul($spent, '-1'), $limit->amount) ? bcadd($spent, $limit->amount) : '0';

app/Support/Repositories/Recurring/FiltersWeekends.php

@@ -28,6 +28,7 @@ use Carbon\Carbon;
 use FireflyIII\Enums\RecurrenceRepetitionWeekend;
 use FireflyIII\Models\RecurrenceRepetition;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Trait FiltersWeekends
@@ -39,9 +40,9 @@ trait FiltersWeekends
      */
     protected function filterWeekends(RecurrenceRepetition $repetition, array $dates): array
     {
-        app('log')->debug(sprintf('Now in %s', __METHOD__));
+        Log::debug(sprintf('Now in %s', __METHOD__));
         if (RecurrenceRepetitionWeekend::WEEKEND_DO_NOTHING->value === $repetition->weekend) {
-            app('log')->debug('Repetition will not be filtered on weekend days.');
+            Log::debug('Repetition will not be filtered on weekend days.');
 
             return $dates;
         }
@@ -53,7 +54,7 @@ trait FiltersWeekends
             if (!$isWeekend) {
                 $return[] = clone $date;
 
-                // app('log')->debug(sprintf('Date is %s, not a weekend date.', $date->format('D d M Y')));
+                // Log::debug(sprintf('Date is %s, not a weekend date.', $date->format('D d M Y')));
                 continue;
             }
 
@@ -61,7 +62,7 @@ trait FiltersWeekends
             if (RecurrenceRepetitionWeekend::WEEKEND_TO_FRIDAY->value === $repetition->weekend) {
                 $clone    = clone $date;
                 $clone->addDays(5 - $date->dayOfWeekIso);
-                app('log')->debug(
+                Log::debug(
                     sprintf('Date is %s, and this is in the weekend, so corrected to %s (Friday).', $date->format('D d M Y'), $clone->format('D d M Y'))
                 );
                 $return[] = clone $clone;
@@ -73,23 +74,22 @@ trait FiltersWeekends
             if (RecurrenceRepetitionWeekend::WEEKEND_TO_MONDAY->value === $repetition->weekend) {
                 $clone    = clone $date;
                 $clone->addDays(8 - $date->dayOfWeekIso);
-                app('log')->debug(
+                Log::debug(
                     sprintf('Date is %s, and this is in the weekend, so corrected to %s (Monday).', $date->format('D d M Y'), $clone->format('D d M Y'))
                 );
                 $return[] = $clone;
 
-                continue;
             }
-            // app('log')->debug(sprintf('Date is %s, removed from final result', $date->format('D d M Y')));
+            // Log::debug(sprintf('Date is %s, removed from final result', $date->format('D d M Y')));
         }
 
         // filter unique dates
-        app('log')->debug(sprintf('Count before filtering: %d', count($dates)));
-        $collection = new Collection($return);
+        Log::debug(sprintf('Count before filtering: %d', count($dates)));
+        $collection = new Collection()->push(...$return);
         $filtered   = $collection->unique();
         $return     = $filtered->toArray();
 
-        app('log')->debug(sprintf('Count after filtering: %d', count($return)));
+        Log::debug(sprintf('Count after filtering: %d', count($return)));
 
         return $return;
     }

app/Support/Search/OperatorQuerySearch.php

@@ -450,7 +450,7 @@ class OperatorQuerySearch implements SearchInterface
             case 'source_account_id':
                 $account                 = $this->accountRepository->find((int) $value);
                 if (null !== $account) {
-                    $this->collector->setSourceAccounts(new Collection([$account]));
+                    $this->collector->setSourceAccounts(new Collection()->push($account));
                 }
                 if (null === $account) {
                     // since the source does not exist, cannot return results:
@@ -463,7 +463,7 @@ class OperatorQuerySearch implements SearchInterface
             case '-source_account_id':
                 $account                 = $this->accountRepository->find((int) $value);
                 if (null !== $account) {
-                    $this->collector->excludeSourceAccounts(new Collection([$account]));
+                    $this->collector->excludeSourceAccounts(new Collection()->push($account));
                 }
                 if (null === $account) {
                     // since the source does not exist, cannot return results:
@@ -580,7 +580,7 @@ class OperatorQuerySearch implements SearchInterface
             case 'destination_account_id':
                 $account                 = $this->accountRepository->find((int) $value);
                 if (null !== $account) {
-                    $this->collector->setDestinationAccounts(new Collection([$account]));
+                    $this->collector->setDestinationAccounts(new Collection()->push($account));
                 }
                 if (null === $account) {
                     Log::warning('Call to findNothing() because dest account does not exist (destination_account_id).');
@@ -592,7 +592,7 @@ class OperatorQuerySearch implements SearchInterface
             case '-destination_account_id':
                 $account                 = $this->accountRepository->find((int) $value);
                 if (null !== $account) {
-                    $this->collector->excludeDestinationAccounts(new Collection([$account]));
+                    $this->collector->excludeDestinationAccounts(new Collection()->push($account));
                 }
                 if (null === $account) {
                     Log::warning('Call to findNothing() because dest account does not exist (-destination_account_id).');
@@ -652,37 +652,37 @@ class OperatorQuerySearch implements SearchInterface
                 //
             case 'source_is_cash':
                 $account                 = $this->getCashAccount();
-                $this->collector->setSourceAccounts(new Collection([$account]));
+                $this->collector->setSourceAccounts(new Collection()->push($account));
 
                 break;
 
             case '-source_is_cash':
                 $account                 = $this->getCashAccount();
-                $this->collector->excludeSourceAccounts(new Collection([$account]));
+                $this->collector->excludeSourceAccounts(new Collection()->push($account));
 
                 break;
 
             case 'destination_is_cash':
                 $account                 = $this->getCashAccount();
-                $this->collector->setDestinationAccounts(new Collection([$account]));
+                $this->collector->setDestinationAccounts(new Collection()->push($account));
 
                 break;
 
             case '-destination_is_cash':
                 $account                 = $this->getCashAccount();
-                $this->collector->excludeDestinationAccounts(new Collection([$account]));
+                $this->collector->excludeDestinationAccounts(new Collection()->push($account));
 
                 break;
 
             case 'account_is_cash':
                 $account                 = $this->getCashAccount();
-                $this->collector->setAccounts(new Collection([$account]));
+                $this->collector->setAccounts(new Collection()->push($account));
 
                 break;
 
             case '-account_is_cash':
                 $account                 = $this->getCashAccount();
-                $this->collector->excludeAccounts(new Collection([$account]));
+                $this->collector->excludeAccounts(new Collection()->push($account));
 
                 break;
 
@@ -1070,7 +1070,7 @@ class OperatorQuerySearch implements SearchInterface
             case '-bill_is':
                 $bill                    = $this->billRepository->findByName($value);
                 if (null !== $bill) {
-                    $this->collector->excludeBills(new Collection([$bill]));
+                    $this->collector->excludeBills(new Collection()->push($bill));
 
                     break;
                 }