Code cleanup

app/Helpers/Collector/GroupCollectorInterface.php

@@ -66,6 +66,33 @@ interface GroupCollectorInterface
      */
     public function amountMore(string $amount): GroupCollectorInterface;
 
+    /**
+     * End of the description must match:
+     *
+     * @param array $array
+     *
+     * @return GroupCollectorInterface
+     */
+    public function descriptionEnds(array $array): GroupCollectorInterface;
+
+    /**
+     * Description must be:
+     *
+     * @param string $value
+     *
+     * @return GroupCollectorInterface
+     */
+    public function descriptionIs(string $value): GroupCollectorInterface;
+
+    /**
+     * Beginning of the description must match:
+     *
+     * @param array $array
+     *
+     * @return GroupCollectorInterface
+     */
+    public function descriptionStarts(array $array): GroupCollectorInterface;
+
     /**
      * Exclude destination accounts.
      *
@@ -105,6 +132,46 @@ interface GroupCollectorInterface
      */
     public function getPaginatedGroups(): LengthAwarePaginator;
 
+    /**
+     * @return GroupCollectorInterface
+     */
+    public function hasAnyTag(): GroupCollectorInterface;
+
+    /**
+     * Has attachments
+     *
+     * @return GroupCollectorInterface
+     */
+    public function hasAttachments(): GroupCollectorInterface;
+
+    /**
+     * @param string $value
+     *
+     * @return GroupCollectorInterface
+     */
+    public function notesContain(string $value): GroupCollectorInterface;
+
+    /**
+     * @param string $value
+     *
+     * @return GroupCollectorInterface
+     */
+    public function notesEndWith(string $value): GroupCollectorInterface;
+
+    /**
+     * @param string $value
+     *
+     * @return GroupCollectorInterface
+     */
+    public function notesExactly(string $value): GroupCollectorInterface;
+
+    /**
+     * @param string $value
+     *
+     * @return GroupCollectorInterface
+     */
+    public function notesStartWith(string $value): GroupCollectorInterface;
+
     /**
      * Define which accounts can be part of the source and destination transactions.
      *
@@ -213,15 +280,6 @@ interface GroupCollectorInterface
      */
     public function setCurrency(TransactionCurrency $currency): GroupCollectorInterface;
 
-    /**
-     * Limit results to a specific foreign currency.
-     *
-     * @param TransactionCurrency $currency
-     *
-     * @return GroupCollectorInterface
-     */
-    public function setForeignCurrency(TransactionCurrency $currency): GroupCollectorInterface;
-
     /**
      * Set destination accounts.
      *
@@ -232,13 +290,22 @@ interface GroupCollectorInterface
     public function setDestinationAccounts(Collection $accounts): GroupCollectorInterface;
 
     /**
-     * Limit the result to a set of specific transaction journals.
+     * Look for specific external ID's.
      *
-     * @param array $journalIds
+     * @param string $externalId
      *
      * @return GroupCollectorInterface
      */
-    public function setJournalIds(array $journalIds): GroupCollectorInterface;
+    public function setExternalId(string $externalId): GroupCollectorInterface;
+
+    /**
+     * Limit results to a specific foreign currency.
+     *
+     * @param TransactionCurrency $currency
+     *
+     * @return GroupCollectorInterface
+     */
+    public function setForeignCurrency(TransactionCurrency $currency): GroupCollectorInterface;
 
     /**
      * Limit the result to a set of specific transaction groups.
@@ -249,6 +316,24 @@ interface GroupCollectorInterface
      */
     public function setIds(array $groupIds): GroupCollectorInterface;
 
+    /**
+     * Look for specific external ID's.
+     *
+     * @param string $externalId
+     *
+     * @return GroupCollectorInterface
+     */
+    public function setInternalReference(string $externalId): GroupCollectorInterface;
+
+    /**
+     * Limit the result to a set of specific transaction journals.
+     *
+     * @param array $journalIds
+     *
+     * @return GroupCollectorInterface
+     */
+    public function setJournalIds(array $journalIds): GroupCollectorInterface;
+
     /**
      * Limit the number of returned entries.
      *
@@ -286,33 +371,6 @@ interface GroupCollectorInterface
      */
     public function setSearchWords(array $array): GroupCollectorInterface;
 
-    /**
-     * Beginning of the description must match:
-     *
-     * @param array $array
-     *
-     * @return GroupCollectorInterface
-     */
-    public function descriptionStarts(array $array): GroupCollectorInterface;
-
-    /**
-     * End of the description must match:
-     *
-     * @param array $array
-     *
-     * @return GroupCollectorInterface
-     */
-    public function descriptionEnds(array $array): GroupCollectorInterface;
-
-    /**
-     * Description must be:
-     *
-     * @param string $value
-     *
-     * @return GroupCollectorInterface
-     */
-    public function descriptionIs(string $value): GroupCollectorInterface;
-
     /**
      * Set source accounts.
      *
@@ -340,16 +398,6 @@ interface GroupCollectorInterface
      */
     public function setTags(Collection $tags): GroupCollectorInterface;
 
-    /**
-     * @return GroupCollectorInterface
-     */
-    public function withoutTags(): GroupCollectorInterface;
-
-    /**
-     * @return GroupCollectorInterface
-     */
-    public function hasAnyTag(): GroupCollectorInterface;
-
     /**
      * Limit the search to one specific transaction group.
      *
@@ -409,6 +457,13 @@ interface GroupCollectorInterface
      */
     public function withAccountInformation(): GroupCollectorInterface;
 
+    /**
+     * Any notes, no matter what.
+     *
+     * @return GroupCollectorInterface
+     */
+    public function withAnyNotes(): GroupCollectorInterface;
+
     /**
      * Add basic info on attachments of transactions.
      *
@@ -416,13 +471,6 @@ interface GroupCollectorInterface
      */
     public function withAttachmentInformation(): GroupCollectorInterface;
 
-    /**
-     * Has attachments
-     *
-     * @return GroupCollectorInterface
-     */
-    public function hasAttachments(): GroupCollectorInterface;
-
     /**
      * Include bill name + ID.
      *
@@ -430,6 +478,13 @@ interface GroupCollectorInterface
      */
     public function withBillInformation(): GroupCollectorInterface;
 
+    /**
+     * Limit results to a transactions with a budget.
+     *
+     * @return GroupCollectorInterface
+     */
+    public function withBudget(): GroupCollectorInterface;
+
     /**
      * Will include budget ID + name, if any.
      *
@@ -437,6 +492,13 @@ interface GroupCollectorInterface
      */
     public function withBudgetInformation(): GroupCollectorInterface;
 
+    /**
+     * Limit results to a transactions with a category.
+     *
+     * @return GroupCollectorInterface
+     */
+    public function withCategory(): GroupCollectorInterface;
+
     /**
      * Will include category ID + name, if any.
      *
@@ -451,42 +513,6 @@ interface GroupCollectorInterface
      */
     public function withNotes(): GroupCollectorInterface;
 
-    /**
-     * Any notes, no matter what.
-     *
-     * @return GroupCollectorInterface
-     */
-    public function withAnyNotes(): GroupCollectorInterface;
-
-    /**
-     * @param string $value
-     * @return GroupCollectorInterface
-     */
-    public function notesContain(string $value): GroupCollectorInterface;
-    /**
-     * @param string $value
-     * @return GroupCollectorInterface
-     */
-    public function withoutNotes(): GroupCollectorInterface;
-
-    /**
-     * @param string $value
-     * @return GroupCollectorInterface
-     */
-    public function notesStartWith(string $value): GroupCollectorInterface;
-
-    /**
-     * @param string $value
-     * @return GroupCollectorInterface
-     */
-    public function notesEndWith(string $value): GroupCollectorInterface;
-
-    /**
-     * @param string $value
-     * @return GroupCollectorInterface
-     */
-    public function notesExactly(string $value): GroupCollectorInterface;
-
     /**
      * Add tag info.
      *
@@ -494,13 +520,6 @@ interface GroupCollectorInterface
      */
     public function withTagInformation(): GroupCollectorInterface;
 
-    /**
-     * Limit results to a transactions without a budget.
-     *
-     * @return GroupCollectorInterface
-     */
-    public function withoutBudget(): GroupCollectorInterface;
-
     /**
      * Limit results to a transactions without a bill.
      *
@@ -508,6 +527,13 @@ interface GroupCollectorInterface
      */
     public function withoutBill(): GroupCollectorInterface;
 
+    /**
+     * Limit results to a transactions without a budget.
+     *
+     * @return GroupCollectorInterface
+     */
+    public function withoutBudget(): GroupCollectorInterface;
+
     /**
      * Limit results to a transactions without a category.
      *
@@ -516,35 +542,15 @@ interface GroupCollectorInterface
     public function withoutCategory(): GroupCollectorInterface;
 
     /**
-     * Limit results to a transactions with a category.
+     * @param string $value
      *
      * @return GroupCollectorInterface
      */
-    public function withCategory(): GroupCollectorInterface;
+    public function withoutNotes(): GroupCollectorInterface;
 
     /**
-     * Limit results to a transactions with a budget.
-     *
      * @return GroupCollectorInterface
      */
-    public function withBudget(): GroupCollectorInterface;
-
-    /**
-     * Look for specific external ID's.
-     *
-     * @param string $externalId
-     *
-     * @return GroupCollectorInterface
-     */
-    public function setExternalId(string $externalId): GroupCollectorInterface;
-
-    /**
-     * Look for specific external ID's.
-     *
-     * @param string $externalId
-     *
-     * @return GroupCollectorInterface
-     */
-    public function setInternalReference(string $externalId): GroupCollectorInterface;
+    public function withoutTags(): GroupCollectorInterface;
 
 }