Code clean up.

This commit is contained in:
James Cole
2017-11-15 10:52:29 +01:00
parent aee17221eb
commit 649dca77f5
305 changed files with 1200 additions and 1600 deletions

View File

@@ -53,7 +53,6 @@ class AbstractTrigger
*/
private function __construct()
{
}
/**
@@ -122,6 +121,4 @@ class AbstractTrigger
{
return $this->triggerValue;
}
}

View File

@@ -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;
}
}

View File

@@ -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;
}
}

View File

@@ -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;
}
}

View File

@@ -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
)
);

View File

@@ -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
)
);

View File

@@ -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;
}
}

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;
}
}

View File

@@ -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;
}
}

View File

@@ -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;
}
}

View File

@@ -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;
}
}

View File

@@ -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;
}
}

View File

@@ -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;
}
}

View File

@@ -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
)
);

View File

@@ -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;
}
}

View File

@@ -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;
}
}

View File

@@ -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;
}
}

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;
}
}

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;
}
}

View File

@@ -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
)
);

View File

@@ -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;
}
}

View File

@@ -92,6 +92,5 @@ final class ToAccountStarts extends AbstractTrigger implements TriggerInterface
return false;
}
}