Code clean up.

2025-10-12 15:35:15 +00:00 · 2017-11-15 10:52:29 +01:00
parent aee17221eb
commit 649dca77f5
305 changed files with 1200 additions and 1600 deletions
--- a/app/TransactionRules/Actions/AddTag.php
+++ b/app/TransactionRules/Actions/AddTag.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\TransactionRules\Actions;

-
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionJournal;
--- a/app/TransactionRules/Actions/AppendDescription.php
+++ b/app/TransactionRules/Actions/AppendDescription.php
@@ -34,7 +34,6 @@ use Log;
 */
 class AppendDescription implements ActionInterface
 {
-
    private $action;


--- a/app/TransactionRules/Actions/AppendNotes.php
+++ b/app/TransactionRules/Actions/AppendNotes.php
@@ -35,7 +35,6 @@ use Log;
 */
 class AppendNotes implements ActionInterface
 {
-
    private $action;


--- a/app/TransactionRules/Actions/ClearBudget.php
+++ b/app/TransactionRules/Actions/ClearBudget.php
@@ -34,7 +34,6 @@ use Log;
 */
 class ClearBudget implements ActionInterface
 {
-
    private $action;


--- a/app/TransactionRules/Actions/ClearCategory.php
+++ b/app/TransactionRules/Actions/ClearCategory.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\TransactionRules\Actions;

-
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\TransactionJournal;
 use Log;
@@ -35,7 +34,6 @@ use Log;
 */
 class ClearCategory implements ActionInterface
 {
-
    private $action;


--- a/app/TransactionRules/Actions/ClearNotes.php
+++ b/app/TransactionRules/Actions/ClearNotes.php
@@ -35,7 +35,6 @@ use Log;
 */
 class ClearNotes implements ActionInterface
 {
-
    private $action;


--- a/app/TransactionRules/Actions/PrependDescription.php
+++ b/app/TransactionRules/Actions/PrependDescription.php
@@ -34,7 +34,6 @@ use Log;
 */
 class PrependDescription implements ActionInterface
 {
-
    private $action;


--- a/app/TransactionRules/Actions/PrependNotes.php
+++ b/app/TransactionRules/Actions/PrependNotes.php
@@ -35,7 +35,6 @@ use Log;
 */
 class PrependNotes implements ActionInterface
 {
-
    private $action;


--- a/app/TransactionRules/Actions/RemoveAllTags.php
+++ b/app/TransactionRules/Actions/RemoveAllTags.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\TransactionRules\Actions;

-
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\TransactionJournal;
 use Log;
@@ -59,6 +58,5 @@ class RemoveAllTags implements ActionInterface
        $journal->tags()->detach();

        return true;
-
    }
 }
--- a/app/TransactionRules/Actions/RemoveTag.php
+++ b/app/TransactionRules/Actions/RemoveTag.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\TransactionRules\Actions;

-
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionJournal;
@@ -36,7 +35,6 @@ use Log;
 */
 class RemoveTag implements ActionInterface
 {
-
    private $action;


--- a/app/TransactionRules/Actions/SetBudget.php
+++ b/app/TransactionRules/Actions/SetBudget.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\TransactionRules\Actions;

-
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\TransactionJournal;
@@ -38,7 +37,6 @@ use Log;
 */
 class SetBudget implements ActionInterface
 {
-
    private $action;


@@ -78,7 +76,9 @@ class SetBudget implements ActionInterface
        if ($journal->transactionType->type !== TransactionType::WITHDRAWAL) {
            Log::debug(
                sprintf(
-                    'RuleAction SetBudget could not set budget of journal #%d to "%s" because journal is a %s.', $journal->id, $search,
+                    'RuleAction SetBudget could not set budget of journal #%d to "%s" because journal is a %s.',
+                    $journal->id,
+                    $search,
                    $journal->transactionType->type
                )
            );
--- a/app/TransactionRules/Actions/SetCategory.php
+++ b/app/TransactionRules/Actions/SetCategory.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\TransactionRules\Actions;

-
 use FireflyIII\Models\Category;
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\TransactionJournal;
@@ -36,7 +35,6 @@ use Log;
 */
 class SetCategory implements ActionInterface
 {
-
    private $action;


--- a/app/TransactionRules/Actions/SetDescription.php
+++ b/app/TransactionRules/Actions/SetDescription.php
@@ -34,7 +34,6 @@ use Log;
 */
 class SetDescription implements ActionInterface
 {
-
    private $action;


@@ -61,7 +60,8 @@ class SetDescription implements ActionInterface

        Log::debug(
            sprintf(
-                'RuleAction SetDescription changed the description of journal #%d from "%s" to "%s".', $journal->id,
+                'RuleAction SetDescription changed the description of journal #%d from "%s" to "%s".',
+                $journal->id,
                $oldDescription,
                $this->action->action_value
            )
--- a/app/TransactionRules/Actions/SetDestinationAccount.php
+++ b/app/TransactionRules/Actions/SetDestinationAccount.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\TransactionRules\Actions;

-
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\RuleAction;
@@ -39,7 +38,6 @@ use Log;
 */
 class SetDestinationAccount implements ActionInterface
 {
-
    private $action;

    /** @var  TransactionJournal */
@@ -87,7 +85,8 @@ class SetDestinationAccount implements ActionInterface
            Log::error(
                sprintf(
                    'Cannot change destination account of journal #%d because no asset account with name "%s" exists.',
-                    $journal->id, $this->action->action_value
+                    $journal->id,
+                    $this->action->action_value
                )
            );

--- a/app/TransactionRules/Actions/SetNotes.php
+++ b/app/TransactionRules/Actions/SetNotes.php
@@ -35,7 +35,6 @@ use Log;
 */
 class SetNotes implements ActionInterface
 {
-
    private $action;


--- a/app/TransactionRules/Actions/SetSourceAccount.php
+++ b/app/TransactionRules/Actions/SetSourceAccount.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\TransactionRules\Actions;

-
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\RuleAction;
@@ -39,7 +38,6 @@ use Log;
 */
 class SetSourceAccount implements ActionInterface
 {
-
    private $action;

    /** @var  TransactionJournal */
@@ -86,7 +84,8 @@ class SetSourceAccount implements ActionInterface
            Log::error(
                sprintf(
                    'Cannot change source account of journal #%d because no asset account with name "%s" exists.',
-                    $journal->id, $this->action->action_value
+                    $journal->id,
+                    $this->action->action_value
                )
            );

--- a/app/TransactionRules/Processor.php
+++ b/app/TransactionRules/Processor.php
@@ -193,7 +193,6 @@ final class Processor
        }

        return false;
-
    }

    /**
@@ -220,7 +219,6 @@ final class Processor
        }

        return false;
-
    }

    /**
@@ -241,7 +239,6 @@ final class Processor
                Log::debug('Stop processing now and break.');
                break;
            }
-
        }

        return true;
@@ -272,14 +269,10 @@ final class Processor
                Log::debug('Stop processing this trigger and break.');
                break;
            }
-
        }
        $result = ($hitTriggers === $foundTriggers && $foundTriggers > 0);
        Log::debug('Result of triggered()', ['hitTriggers' => $hitTriggers, 'foundTriggers' => $foundTriggers, 'result' => $result]);

        return $result;
-
    }
-
-
 }
--- a/app/TransactionRules/TransactionMatcher.php
+++ b/app/TransactionRules/TransactionMatcher.php
@@ -60,7 +60,6 @@ class TransactionMatcher
    public function __construct(JournalTaskerInterface $tasker)
    {
        $this->tasker = $tasker;
-
    }

    /**
@@ -151,7 +150,6 @@ class TransactionMatcher
        $this->range = $range;

        return $this;
-
    }

    /**
@@ -236,11 +234,8 @@ class TransactionMatcher
            Log::debug(sprintf('reachedEndOfList: %s', var_export($reachedEndOfList, true)));
            Log::debug(sprintf('foundEnough: %s', var_export($foundEnough, true)));
            Log::debug(sprintf('searchedEnough: %s', var_export($searchedEnough, true)));
-
        } while (!$reachedEndOfList && !$foundEnough && !$searchedEnough);

        return $result;
    }
-
-
 }
--- a/app/TransactionRules/Triggers/AbstractTrigger.php
+++ b/app/TransactionRules/Triggers/AbstractTrigger.php
@@ -53,7 +53,6 @@ class AbstractTrigger
     */
    private function __construct()
    {
-
    }

    /**
@@ -122,6 +121,4 @@ class AbstractTrigger
    {
        return $this->triggerValue;
    }
-
-
 }
--- a/app/TransactionRules/Triggers/AmountExactly.php
+++ b/app/TransactionRules/Triggers/AmountExactly.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\TransactionRules\Triggers;

-
 use FireflyIII\Models\TransactionJournal;
 use Log;

@@ -79,6 +78,5 @@ final class AmountExactly extends AbstractTrigger implements TriggerInterface
        Log::debug(sprintf('RuleTrigger AmountExactly for journal #%d: %d matches %d NOT exactly, so return false', $journal->id, $amount, $compare));

        return false;
-
    }
 }
--- a/app/TransactionRules/Triggers/AmountLess.php
+++ b/app/TransactionRules/Triggers/AmountLess.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\TransactionRules\Triggers;

-
 use FireflyIII\Models\TransactionJournal;
 use Log;

@@ -80,6 +79,5 @@ final class AmountLess extends AbstractTrigger implements TriggerInterface
        Log::debug(sprintf('RuleTrigger AmountLess for journal #%d: %d is NOT less than %d, so return false', $journal->id, $amount, $compare));

        return false;
-
    }
 }
--- a/app/TransactionRules/Triggers/AmountMore.php
+++ b/app/TransactionRules/Triggers/AmountMore.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\TransactionRules\Triggers;

-
 use FireflyIII\Models\TransactionJournal;
 use Log;

@@ -86,6 +85,5 @@ final class AmountMore extends AbstractTrigger implements TriggerInterface
        Log::debug(sprintf('RuleTrigger AmountMore for journal #%d: %d is NOT more than %d, so return false', $journal->id, $amount, $compare));

        return false;
-
    }
 }
--- a/app/TransactionRules/Triggers/BudgetIs.php
+++ b/app/TransactionRules/Triggers/BudgetIs.php
@@ -90,7 +90,10 @@ final class BudgetIs extends AbstractTrigger implements TriggerInterface
                        Log::debug(
                            sprintf(
                                'RuleTrigger BudgetIs for journal #%d (transaction #%d): "%s" is "%s", return true.',
-                                $journal->id, $transaction->id, $name, $this->triggerValue
+                                $journal->id,
+                                $transaction->id,
+                                $name,
+                                $this->triggerValue
                            )
                        );

--- a/app/TransactionRules/Triggers/CategoryIs.php
+++ b/app/TransactionRules/Triggers/CategoryIs.php
@@ -90,7 +90,10 @@ final class CategoryIs extends AbstractTrigger implements TriggerInterface
                        Log::debug(
                            sprintf(
                                'RuleTrigger CategoryIs for journal #%d (transaction #%d): "%s" is "%s", return true.',
-                                $journal->id, $transaction->id, $name, $this->triggerValue
+                                $journal->id,
+                                $transaction->id,
+                                $name,
+                                $this->triggerValue
                            )
                        );

--- a/app/TransactionRules/Triggers/DescriptionContains.php
+++ b/app/TransactionRules/Triggers/DescriptionContains.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\TransactionRules\Triggers;

-
 use FireflyIII\Models\TransactionJournal;
 use Log;

@@ -86,6 +85,5 @@ final class DescriptionContains extends AbstractTrigger implements TriggerInterf
        Log::debug(sprintf('RuleTrigger DescriptionContains for journal #%d: "%s" does NOT contain "%s", return false.', $journal->id, $source, $search));

        return false;
-
    }
 }
--- a/app/TransactionRules/Triggers/DescriptionEnds.php
+++ b/app/TransactionRules/Triggers/DescriptionEnds.php
@@ -89,7 +89,6 @@ final class DescriptionEnds extends AbstractTrigger implements TriggerInterface
        $part = substr($description, $searchLength * -1);

        if ($part === $search) {
-
            Log::debug(sprintf('RuleTrigger DescriptionEnds for journal #%d: "%s" ends with "%s", return true.', $journal->id, $description, $search));

            return true;
--- a/app/TransactionRules/Triggers/DescriptionIs.php
+++ b/app/TransactionRules/Triggers/DescriptionIs.php
@@ -72,7 +72,6 @@ final class DescriptionIs extends AbstractTrigger implements TriggerInterface
        $search      = strtolower($this->triggerValue);

        if ($description === $search) {
-
            Log::debug(sprintf('RuleTrigger DescriptionIs for journal #%d: "%s" is "%s", return true.', $journal->id, $description, $search));

            return true;
--- a/app/TransactionRules/Triggers/FromAccountContains.php
+++ b/app/TransactionRules/Triggers/FromAccountContains.php
@@ -84,7 +84,6 @@ final class FromAccountContains extends AbstractTrigger implements TriggerInterf
        $strpos = strpos($fromAccountName, $search);

        if (!($strpos === false)) {
-
            Log::debug(sprintf('RuleTrigger FromAccountContains for journal #%d: "%s" contains "%s", return true.', $journal->id, $fromAccountName, $search));

            return true;
@@ -93,11 +92,12 @@ final class FromAccountContains extends AbstractTrigger implements TriggerInterf
        Log::debug(
            sprintf(
                'RuleTrigger FromAccountContains for journal #%d: "%s" does not contain "%s", return false.',
-                $journal->id, $fromAccountName, $search
+                $journal->id,
+                $fromAccountName,
+                $search
            )
        );

        return false;
-
    }
 }
--- a/app/TransactionRules/Triggers/FromAccountEnds.php
+++ b/app/TransactionRules/Triggers/FromAccountEnds.php
@@ -104,6 +104,5 @@ final class FromAccountEnds extends AbstractTrigger implements TriggerInterface
        Log::debug(sprintf('RuleTrigger FromAccountEnds for journal #%d: "%s" does not end with "%s", return false.', $journal->id, $name, $search));

        return false;
-
    }
 }
--- a/app/TransactionRules/Triggers/FromAccountIs.php
+++ b/app/TransactionRules/Triggers/FromAccountIs.php
@@ -91,6 +91,5 @@ final class FromAccountIs extends AbstractTrigger implements TriggerInterface
        Log::debug(sprintf('RuleTrigger FromAccountIs for journal #%d: "%s" is NOT "%s", return false.', $journal->id, $name, $search));

        return false;
-
    }
 }
--- a/app/TransactionRules/Triggers/HasAnyBudget.php
+++ b/app/TransactionRules/Triggers/HasAnyBudget.php
@@ -86,6 +86,5 @@ final class HasAnyBudget extends AbstractTrigger implements TriggerInterface
        Log::debug(sprintf('RuleTrigger HasAnyBudget for journal #%d: count is %d, return false.', $journal->id, $count));

        return false;
-
    }
 }
--- a/app/TransactionRules/Triggers/HasAnyCategory.php
+++ b/app/TransactionRules/Triggers/HasAnyCategory.php
@@ -86,6 +86,5 @@ final class HasAnyCategory extends AbstractTrigger implements TriggerInterface
        Log::debug(sprintf('RuleTrigger HasAnyCategory for journal #%d: count is %d, return false.', $journal->id, $count));

        return false;
-
    }
 }
--- a/app/TransactionRules/Triggers/HasAnyTag.php
+++ b/app/TransactionRules/Triggers/HasAnyTag.php
@@ -71,6 +71,5 @@ final class HasAnyTag extends AbstractTrigger implements TriggerInterface
        Log::debug(sprintf('RuleTrigger HasAnyTag for journal #%d: count is %d, return false.', $journal->id, $count));

        return false;
-
    }
 }
--- a/app/TransactionRules/Triggers/HasAttachment.php
+++ b/app/TransactionRules/Triggers/HasAttachment.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\TransactionRules\Triggers;

-
 use FireflyIII\Models\TransactionJournal;
 use Log;

@@ -68,7 +67,10 @@ class HasAttachment extends AbstractTrigger implements TriggerInterface
        if ($attachments >= $minimum) {
            Log::debug(
                sprintf(
-                    'RuleTrigger HasAttachment for journal #%d: count is %d, is more than or equal to %d, return true.', $journal->id, $attachments, $minimum
+                    'RuleTrigger HasAttachment for journal #%d: count is %d, is more than or equal to %d, return true.',
+                    $journal->id,
+                    $attachments,
+                    $minimum
                )
            );

--- a/app/TransactionRules/Triggers/HasNoBudget.php
+++ b/app/TransactionRules/Triggers/HasNoBudget.php
@@ -79,6 +79,5 @@ final class HasNoBudget extends AbstractTrigger implements TriggerInterface
        Log::debug(sprintf('RuleTrigger HasNoBudget for journal #%d: count is %d, return false.', $journal->id, $count));

        return false;
-
    }
 }
--- a/app/TransactionRules/Triggers/HasNoCategory.php
+++ b/app/TransactionRules/Triggers/HasNoCategory.php
@@ -79,6 +79,5 @@ final class HasNoCategory extends AbstractTrigger implements TriggerInterface
        Log::debug(sprintf('RuleTrigger HasNoCategory for journal #%d: count is %d, return false.', $journal->id, $count));

        return false;
-
    }
 }
--- a/app/TransactionRules/Triggers/HasNoTag.php
+++ b/app/TransactionRules/Triggers/HasNoTag.php
@@ -71,6 +71,5 @@ final class HasNoTag extends AbstractTrigger implements TriggerInterface
        Log::debug(sprintf('RuleTrigger HasNoTag for journal #%d: count is %d, return false.', $journal->id, $count));

        return false;
-
    }
 }
--- a/app/TransactionRules/Triggers/NotesAny.php
+++ b/app/TransactionRules/Triggers/NotesAny.php
@@ -71,7 +71,6 @@ final class NotesAny extends AbstractTrigger implements TriggerInterface
        }

        if (strlen($text) > 0) {
-
            Log::debug(sprintf('RuleTrigger NotesEmpty for journal #%d: strlen > 0, return true.', $journal->id));

            return true;
--- a/app/TransactionRules/Triggers/NotesAre.php
+++ b/app/TransactionRules/Triggers/NotesAre.php
@@ -78,7 +78,6 @@ final class NotesAre extends AbstractTrigger implements TriggerInterface
        $search = strtolower($this->triggerValue);

        if ($text === $search && strlen($text) > 0) {
-
            Log::debug(sprintf('RuleTrigger NotesAre for journal #%d: "%s" is "%s", return true.', $journal->id, $text, $search));

            return true;
--- a/app/TransactionRules/Triggers/NotesContain.php
+++ b/app/TransactionRules/Triggers/NotesContain.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\TransactionRules\Triggers;

-
 use FireflyIII\Models\Note;
 use FireflyIII\Models\TransactionJournal;
 use Log;
@@ -93,7 +92,6 @@ final class NotesContain extends AbstractTrigger implements TriggerInterface

        $strpos = strpos($text, $search);
        if (!($strpos === false)) {
-
            Log::debug(sprintf('RuleTrigger NotesContain for journal #%d: "%s" contains "%s", return true.', $journal->id, $text, $search));

            return true;
@@ -102,6 +100,5 @@ final class NotesContain extends AbstractTrigger implements TriggerInterface
        Log::debug(sprintf('RuleTrigger NotesContain for journal #%d: "%s" does NOT contain "%s", return false.', $journal->id, $text, $search));

        return false;
-
    }
 }
--- a/app/TransactionRules/Triggers/NotesEmpty.php
+++ b/app/TransactionRules/Triggers/NotesEmpty.php
@@ -71,7 +71,6 @@ final class NotesEmpty extends AbstractTrigger implements TriggerInterface
        }

        if (strlen($text) === 0) {
-
            Log::debug(sprintf('RuleTrigger NotesEmpty for journal #%d: strlen is 0, return true.', $journal->id));

            return true;
--- a/app/TransactionRules/Triggers/NotesEnd.php
+++ b/app/TransactionRules/Triggers/NotesEnd.php
@@ -95,7 +95,6 @@ final class NotesEnd extends AbstractTrigger implements TriggerInterface
        $part = substr($text, $searchLength * -1);

        if ($part === $search) {
-
            Log::debug(sprintf('RuleTrigger NotesEnd for journal #%d: "%s" ends with "%s", return true.', $journal->id, $text, $search));

            return true;
--- a/app/TransactionRules/Triggers/NotesStart.php
+++ b/app/TransactionRules/Triggers/NotesStart.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\TransactionRules\Triggers;

-
 use FireflyIII\Models\Note;
 use FireflyIII\Models\TransactionJournal;
 use Log;
@@ -94,6 +93,5 @@ final class NotesStart extends AbstractTrigger implements TriggerInterface
        Log::debug(sprintf('RuleTrigger NotesStart for journal #%d: "%s" does not start with "%s", return false.', $journal->id, $text, $search));

        return false;
-
    }
 }
--- a/app/TransactionRules/Triggers/ToAccountContains.php
+++ b/app/TransactionRules/Triggers/ToAccountContains.php
@@ -84,7 +84,6 @@ final class ToAccountContains extends AbstractTrigger implements TriggerInterfac
        $strpos = strpos($toAccountName, $search);

        if (!($strpos === false)) {
-
            Log::debug(sprintf('RuleTrigger ToAccountContains for journal #%d: "%s" contains "%s", return true.', $journal->id, $toAccountName, $search));

            return true;
@@ -93,7 +92,9 @@ final class ToAccountContains extends AbstractTrigger implements TriggerInterfac
        Log::debug(
            sprintf(
                'RuleTrigger ToAccountContains for journal #%d: "%s" does not contain "%s", return false.',
-                $journal->id, $toAccountName, $search
+                $journal->id,
+                $toAccountName,
+                $search
            )
        );

--- a/app/TransactionRules/Triggers/ToAccountIs.php
+++ b/app/TransactionRules/Triggers/ToAccountIs.php
@@ -91,6 +91,5 @@ final class ToAccountIs extends AbstractTrigger implements TriggerInterface
        Log::debug(sprintf('RuleTrigger ToAccountIs for journal #%d: "%s" is NOT "%s", return true.', $journal->id, $toAccountName, $search));

        return false;
-
    }
 }
--- a/app/TransactionRules/Triggers/ToAccountStarts.php
+++ b/app/TransactionRules/Triggers/ToAccountStarts.php
@@ -92,6 +92,5 @@ final class ToAccountStarts extends AbstractTrigger implements TriggerInterface


        return false;
-
    }
 }