kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 14:12:15 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2021-03-28 11:43:07 +02:00
parent 5abbb8a807
commit 2c575f3ca5
379 changed files with 304 additions and 1727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/TransactionRules/Actions/ConvertToDeposit.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\TransactionRules\Actions;
use DB;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Factory\AccountFactory;

2
app/TransactionRules/Actions/ConvertToTransfer.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\TransactionRules\Actions;
use DB;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;

8
app/TransactionRules/Actions/ConvertToWithdrawal.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\TransactionRules\Actions;
use DB;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Factory\AccountFactory;
@@ -87,8 +85,6 @@ class ConvertToWithdrawal implements ActionInterface
$expenseName = '' === $this->action->action_value ? $journal['source_account_name'] : $this->action->action_value;
$expense = $factory->findOrCreate($expenseName, AccountType::EXPENSE);
$destinationId = $journal['destination_account_id'];
Log::debug(sprintf('ConvertToWithdrawal. Action value is "%s", expense name is "%s"', $this->action->action_value, $expenseName));
// update source transaction(s) to be the original destination account
@@ -126,15 +122,11 @@ class ConvertToWithdrawal implements ActionInterface
*/
private function convertTransferArray(array $journal): bool
{
// find or create expense account.
$user = User::find($journal['user_id']);
/** @var AccountFactory $factory */
$factory = app(AccountFactory::class);
$factory->setUser($user);
$expenseName = '' === $this->action->action_value ? $journal['destination_account_name'] : $this->action->action_value;
$expense = $factory->findOrCreate($expenseName, AccountType::EXPENSE);

2
app/TransactionRules/Actions/LinkToBill.php
View File

@@ -78,8 +78,6 @@ class LinkToBill implements ActionInterface
$journal['transaction_journal_id'], $billName
)
);
return false;
}
}

2
app/TransactionRules/Actions/RemoveAllTags.php
View File

@@ -25,8 +25,6 @@ namespace FireflyIII\TransactionRules\Actions;
use DB;
use FireflyIII\Models\RuleAction;
use Log;
/**
* Class RemoveAllTags.
*/

2
app/TransactionRules/Actions/SetSourceAccount.php
View File

@@ -92,8 +92,6 @@ class SetSourceAccount implements ActionInterface
return false;
}
// if this is a deposit, the new source account must be a revenue account and may be created:
if (TransactionType::DEPOSIT === $type) {
$newAccount = $this->findRevenueAccount();

4
app/TransactionRules/Actions/UpdatePiggybank.php
View File

@@ -21,11 +21,7 @@
*/
declare(strict_types=1);
namespace FireflyIII\TransactionRules\Actions;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\RuleAction;
use FireflyIII\Models\Transaction;

20
app/TransactionRules/Engine/RuleEngineInterface.php
View File

@@ -1,5 +1,4 @@
<?php
/*
* RuleEngineInterface.php
* Copyright (c) 2021 james@firefly-iii.org
@@ -21,25 +20,6 @@
*/
declare(strict_types=1);
/*
* RuleEngineInterface.php
* Copyright (c) 2020 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
namespace FireflyIII\TransactionRules\Engine;

4
app/TransactionRules/Engine/SearchRuleEngine.php
View File

@@ -245,8 +245,6 @@ class SearchRuleEngine implements RuleEngineInterface
if ($this->hasSpecificJournalTrigger($searchArray)) {
$date = $this->setDateFromJournalTrigger($searchArray);
}
// build and run the search engine.
$searchEngine = app(SearchInterface::class);
$searchEngine->setUser($this->user);
@@ -407,8 +405,6 @@ class SearchRuleEngine implements RuleEngineInterface
}
// pick up from the action if it actually acted or not:
if ($ruleAction->stop_processing) {
Log::debug(sprintf('Rule action "%s" asks to break, so break!', $ruleAction->action_type));

21
app/TransactionRules/Factory/ActionFactory.php
View File

@@ -1,25 +1,4 @@
<?php
/*
* ActionFactory.php
* Copyright (c) 2021 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/**
* ActionFactory.php
* Copyright (c) 2019 Robert Horlings