kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-03 20:14:31 +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
)
);