kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix and expand tests for #2723

Browse Source
This commit is contained in:
James Cole
2019-12-26 11:06:38 +01:00
parent c23f16739c
commit fc8400cdf9
20 changed files with 200 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/TransactionRules/Triggers/FromAccountNumberContains.php
View File

@@ -74,14 +74,14 @@ final class FromAccountNumberContains extends AbstractTrigger implements Trigger
/** @var JournalRepositoryInterface $repository */
$repository = app(JournalRepositoryInterface::class);
$source = $repository->getSourceAccount($journal);
$strpos1 = stripos($source->iban, $this->triggerValue);
$strpos1 = stripos((string)$source->iban, $this->triggerValue);
$strpos2 = stripos($source->account_number, $this->triggerValue);
if (!(false === $strpos1) || !(false === $strpos2)) {
Log::debug(
sprintf(
'RuleTrigger %s for journal #%d: "%s" or "%s" contains "%s", return true.',
get_class($this), $journal->id, $source->iban, $source->account_number, $this->triggerValue
get_class($this), $journal->id, (string)$source->iban, $source->account_number, $this->triggerValue
)
);
@@ -91,7 +91,7 @@ final class FromAccountNumberContains extends AbstractTrigger implements Trigger
Log::debug(
sprintf(
'RuleTrigger %s for journal #%d: "%s" and "%s" does not contain "%s", return false.',
get_class($this), $journal->id, $source->iban, $source->account_number, $this->triggerValue
get_class($this), $journal->id, (string)$source->iban, $source->account_number, $this->triggerValue
)
);

2
app/TransactionRules/Triggers/FromAccountNumberEnds.php
View File

@@ -77,7 +77,7 @@ final class FromAccountNumberEnds extends AbstractTrigger implements TriggerInte
$search = strtolower($this->triggerValue);
$searchLength = strlen($search);
$part1 = substr($source->iban, $searchLength * -1);
$part1 = substr((string)$source->iban, $searchLength * -1);
$part2 = substr($source->account_number, $searchLength * -1);
if (strtolower($part1) === $search

6
app/TransactionRules/Triggers/FromAccountNumberIs.php
View File

@@ -76,11 +76,11 @@ final class FromAccountNumberIs extends AbstractTrigger implements TriggerInterf
$source = $repository->getSourceAccount($journal);
$search = strtolower($this->triggerValue);
if (strtolower($source->iban) === $search || strtolower($source->account_number) === $search) {
if (strtolower((string)$source->iban) === $search || strtolower($source->account_number) === $search) {
Log::debug(
sprintf(
'RuleTrigger %s for journal #%d: "%s" or "%s" is "%s", return true.', $journal->id,
get_class($this), $source->iban, $source->account_number, $search
get_class($this), (string)$source->iban, $source->account_number, $search
)
);
@@ -90,7 +90,7 @@ final class FromAccountNumberIs extends AbstractTrigger implements TriggerInterf
Log::debug(
sprintf(
'RuleTrigger %s for journal #%d: "%s" and "%s" are NOT "%s", return false.',
get_class($this), $journal->id, $source->iban, $source->account_number, $search
get_class($this), $journal->id, (string)$source->iban, $source->account_number, $search
)
);

2
app/TransactionRules/Triggers/FromAccountNumberStarts.php
View File

@@ -75,7 +75,7 @@ final class FromAccountNumberStarts extends AbstractTrigger implements TriggerIn
$repository = app(JournalRepositoryInterface::class);
$source = $repository->getSourceAccount($journal);
$search = strtolower($this->triggerValue);
$part1 = strtolower(substr($source->iban, 0, strlen($search)));
$part1 = strtolower(substr((string)$source->iban, 0, strlen($search)));
$part2 = strtolower(substr($source->account_number, 0, strlen($search)));
if ($part1 === $search || $part2 === $search) {

2
app/TransactionRules/Triggers/FromAccountStarts.php
View File

@@ -75,7 +75,7 @@ final class FromAccountStarts extends AbstractTrigger implements TriggerInterfac
$repository = app(JournalRepositoryInterface::class);
$source = $repository->getSourceAccount($journal);
$search = strtolower($this->triggerValue);
$part = substr($source->name, 0, strlen($search));
$part = strtolower(substr($source->name, 0, strlen($search)));
if ($part === $search) {
Log::debug(

6
app/TransactionRules/Triggers/ToAccountNumberContains.php
View File

@@ -74,14 +74,14 @@ final class ToAccountNumberContains extends AbstractTrigger implements TriggerIn
/** @var JournalRepositoryInterface $repository */
$repository = app(JournalRepositoryInterface::class);
$dest = $repository->getDestinationAccount($journal);
$strpos1 = stripos($dest->iban, $this->triggerValue);
$strpos1 = stripos((string)$dest->iban, $this->triggerValue);
$strpos2 = stripos($dest->account_number, $this->triggerValue);
if (!(false === $strpos1) || !(false === $strpos2)) {
Log::debug(
sprintf(
'RuleTrigger %s for journal #%d: "%s" or "%s" contains "%s", return true.',
get_class($this), $journal->id, $dest->iban, $dest->account_number, $this->triggerValue
get_class($this), $journal->id, (string)$dest->iban, $dest->account_number, $this->triggerValue
)
);
@@ -91,7 +91,7 @@ final class ToAccountNumberContains extends AbstractTrigger implements TriggerIn
Log::debug(
sprintf(
'RuleTrigger %s for journal #%d: "%s" and "%s" does not contain "%s", return false.',
get_class($this), $journal->id, $dest->iban, $dest->account_number, $this->triggerValue
get_class($this), $journal->id, (string)$dest->iban, $dest->account_number, $this->triggerValue
)
);

2
app/TransactionRules/Triggers/ToAccountNumberEnds.php
View File

@@ -77,7 +77,7 @@ final class ToAccountNumberEnds extends AbstractTrigger implements TriggerInterf
$search = strtolower($this->triggerValue);
$searchLength = strlen($search);
$part1 = substr($dest->iban, $searchLength * -1);
$part1 = substr((string)$dest->iban, $searchLength * -1);
$part2 = substr($dest->account_number, $searchLength * -1);
if (strtolower($part1) === $search

6
app/TransactionRules/Triggers/ToAccountNumberIs.php
View File

@@ -76,11 +76,11 @@ final class ToAccountNumberIs extends AbstractTrigger implements TriggerInterfac
$dest = $repository->getDestinationAccount($journal);
$search = strtolower($this->triggerValue);
if (strtolower($dest->iban) === $search || strtolower($dest->account_number) === $search) {
if (strtolower((string)$dest->iban) === $search || strtolower($dest->account_number) === $search) {
Log::debug(
sprintf(
'RuleTrigger %s for journal #%d: "%s" or "%s" is "%s", return true.', $journal->id,
get_class($this), $dest->iban, $dest->account_number, $search
get_class($this), (string)$dest->iban, $dest->account_number, $search
)
);
@@ -90,7 +90,7 @@ final class ToAccountNumberIs extends AbstractTrigger implements TriggerInterfac
Log::debug(
sprintf(
'RuleTrigger %s for journal #%d: "%s" and "%s" are NOT "%s", return false.',
get_class($this), $journal->id, $dest->iban, $dest->account_number, $search
get_class($this), $journal->id, (string)$dest->iban, $dest->account_number, $search
)
);

2
app/TransactionRules/Triggers/ToAccountNumberStarts.php
View File

@@ -75,7 +75,7 @@ final class ToAccountNumberStarts extends AbstractTrigger implements TriggerInte
$repository = app(JournalRepositoryInterface::class);
$dest = $repository->getDestinationAccount($journal);
$search = strtolower($this->triggerValue);
$part1 = strtolower(substr($dest->iban, 0, strlen($search)));
$part1 = strtolower(substr((string)$dest->iban, 0, strlen($search)));
$part2 = strtolower(substr($dest->account_number, 0, strlen($search)));
if ($part1 === $search || $part2 === $search) {

2
app/TransactionRules/Triggers/ToAccountStarts.php
View File

@@ -76,7 +76,7 @@ final class ToAccountStarts extends AbstractTrigger implements TriggerInterface
$repository = app(JournalRepositoryInterface::class);
$dest = $repository->getDestinationAccount($journal);
$search = strtolower($this->triggerValue);
$part = substr($dest->name, 0, strlen($search));
$part = strtolower(substr($dest->name, 0, strlen($search)));
if ($part === $search) {
Log::debug(