Remove a lot of deprecated code.

This commit is contained in:
James Cole
2018-07-25 06:45:25 +02:00
parent dbf019135a
commit 7c950c3022
39 changed files with 189 additions and 621 deletions

View File

@@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Log;
/**
@@ -73,8 +74,11 @@ final class FromAccountContains extends AbstractTrigger implements TriggerInterf
{
$fromAccountName = '';
/** @var JournalRepositoryInterface $repository */
$repository = app(JournalRepositoryInterface::class);
/** @var Account $account */
foreach ($journal->sourceAccountList() as $account) {
foreach ($repository->getJournalSourceAccounts($journal) as $account) {
$fromAccountName .= strtolower($account->name);
}

View File

@@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Log;
/**
@@ -73,8 +74,11 @@ final class FromAccountEnds extends AbstractTrigger implements TriggerInterface
{
$name = '';
/** @var JournalRepositoryInterface $repository */
$repository = app(JournalRepositoryInterface::class);
/** @var Account $account */
foreach ($journal->sourceAccountList() as $account) {
foreach ($repository->getJournalSourceAccounts($journal) as $account) {
$name .= strtolower($account->name);
}

View File

@@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Log;
/**
@@ -73,8 +74,11 @@ final class FromAccountIs extends AbstractTrigger implements TriggerInterface
{
$name = '';
/** @var JournalRepositoryInterface $repository */
$repository = app(JournalRepositoryInterface::class);
/** @var Account $account */
foreach ($journal->sourceAccountList() as $account) {
foreach ($repository->getJournalSourceAccounts($journal) as $account) {
$name .= strtolower($account->name);
}

View File

@@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Log;
/**
@@ -73,8 +74,11 @@ final class FromAccountStarts extends AbstractTrigger implements TriggerInterfac
{
$name = '';
/** @var JournalRepositoryInterface $repository */
$repository = app(JournalRepositoryInterface::class);
/** @var Account $account */
foreach ($journal->sourceAccountList() as $account) {
foreach ($repository->getJournalSourceAccounts($journal) as $account) {
$name .= strtolower($account->name);
}

View File

@@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Log;
/**
@@ -73,8 +74,11 @@ final class ToAccountContains extends AbstractTrigger implements TriggerInterfac
{
$toAccountName = '';
/** @var JournalRepositoryInterface $repository */
$repository = app(JournalRepositoryInterface::class);
/** @var Account $account */
foreach ($journal->destinationAccountList() as $account) {
foreach ($repository->getJournalDestinationAccounts($journal) as $account) {
$toAccountName .= strtolower($account->name);
}

View File

@@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Log;
/**
@@ -73,8 +74,11 @@ final class ToAccountEnds extends AbstractTrigger implements TriggerInterface
{
$toAccountName = '';
/** @var JournalRepositoryInterface $repository */
$repository = app(JournalRepositoryInterface::class);
/** @var Account $account */
foreach ($journal->destinationAccountList() as $account) {
foreach ($repository->getJournalDestinationAccounts($journal) as $account) {
$toAccountName .= strtolower($account->name);
}

View File

@@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Log;
/**
@@ -73,8 +74,11 @@ final class ToAccountIs extends AbstractTrigger implements TriggerInterface
{
$toAccountName = '';
/** @var JournalRepositoryInterface $repository */
$repository = app(JournalRepositoryInterface::class);
/** @var Account $account */
foreach ($journal->destinationAccountList() as $account) {
foreach ($repository->getJournalDestinationAccounts($journal) as $account) {
$toAccountName .= strtolower($account->name);
}

View File

@@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Log;
/**
@@ -73,8 +74,11 @@ final class ToAccountStarts extends AbstractTrigger implements TriggerInterface
{
$toAccountName = '';
/** @var JournalRepositoryInterface $repository */
$repository = app(JournalRepositoryInterface::class);
/** @var Account $account */
foreach ($journal->destinationAccountList() as $account) {
foreach ($repository->getJournalDestinationAccounts($journal) as $account) {
$toAccountName .= strtolower($account->name);
}