Small fixes to collector because constructor is gone.

app/Helpers/Collector/JournalCollector.php

@@ -96,14 +96,6 @@ class JournalCollector implements JournalCollectorInterface
     /** @var User */
     private $user;
 
-    /**
-     * JournalCollector constructor.
-     */
-    public function __construct()
-    {
-        $this->query = $this->startQuery();
-    }
-
     /**
      * @return int
      * @throws FireflyException
@@ -461,6 +453,29 @@ class JournalCollector implements JournalCollectorInterface
         $this->user = $user;
     }
 
+    /**
+     *
+     */
+    public function startQuery()
+    {
+        /** @var EloquentBuilder $query */
+        $query = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                            ->leftJoin('transaction_currencies', 'transaction_currencies.id', 'transaction_journals.transaction_currency_id')
+                            ->leftJoin('transaction_types', 'transaction_types.id', 'transaction_journals.transaction_type_id')
+                            ->leftJoin('bills', 'bills.id', 'transaction_journals.bill_id')
+                            ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+                            ->leftJoin('account_types', 'accounts.account_type_id', 'account_types.id')
+                            ->whereNull('transactions.deleted_at')
+                            ->whereNull('transaction_journals.deleted_at')
+                            ->where('transaction_journals.user_id', $this->user->id)
+                            ->orderBy('transaction_journals.date', 'DESC')
+                            ->orderBy('transaction_journals.order', 'ASC')
+                            ->orderBy('transaction_journals.id', 'DESC');
+
+        $this->query = $query;
+
+    }
+
     /**
      * @return JournalCollectorInterface
      */
@@ -734,27 +749,4 @@ class JournalCollector implements JournalCollectorInterface
             $this->query->leftJoin('tag_transaction_journal', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id');
         }
     }
-
-    /**
-     * @return EloquentBuilder
-     */
-    private function startQuery(): EloquentBuilder
-    {
-        /** @var EloquentBuilder $query */
-        $query = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-                            ->leftJoin('transaction_currencies', 'transaction_currencies.id', 'transaction_journals.transaction_currency_id')
-                            ->leftJoin('transaction_types', 'transaction_types.id', 'transaction_journals.transaction_type_id')
-                            ->leftJoin('bills', 'bills.id', 'transaction_journals.bill_id')
-                            ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
-                            ->leftJoin('account_types', 'accounts.account_type_id', 'account_types.id')
-                            ->whereNull('transactions.deleted_at')
-                            ->whereNull('transaction_journals.deleted_at')
-                            ->where('transaction_journals.user_id', $this->user->id)
-                            ->orderBy('transaction_journals.date', 'DESC')
-                            ->orderBy('transaction_journals.order', 'ASC')
-                            ->orderBy('transaction_journals.id', 'DESC');
-
-        return $query;
-
-    }
 }

app/Helpers/Collector/JournalCollectorInterface.php

@@ -28,7 +28,6 @@ use Illuminate\Support\Collection;
  */
 interface JournalCollectorInterface
 {
-
     /**
      * @return int
      */
@@ -151,6 +150,11 @@ interface JournalCollectorInterface
 
     public function setUser(User $user);
 
+    /**
+     *
+     */
+    public function startQuery();
+
     /**
      * @return JournalCollectorInterface
      */