kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 10:53:37 +00:00
Code Issues Projects Releases Wiki Activity

Change namespace of rules.

Browse Source
This commit is contained in:
James Cole
2017-09-13 07:49:58 +02:00
parent 0583aa53a9
commit 233305ecb4
55 changed files with 108 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Handlers/Events/StoredJournalEventHandler.php
View File

@@ -19,7 +19,7 @@ use FireflyIII\Models\RuleGroup;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface as JRI; use FireflyIII\Repositories\Journal\JournalRepositoryInterface as JRI;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface as PRI; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface as PRI;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface as RGRI; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface as RGRI;
use FireflyIII\Rules\Processor; use FireflyIII\TransactionRules\Processor;
use FireflyIII\Support\Events\BillScanner; use FireflyIII\Support\Events\BillScanner;
use Log; use Log;

2
app/Handlers/Events/UpdatedJournalEventHandler.php
View File

@@ -18,7 +18,7 @@ use FireflyIII\Events\UpdatedTransactionJournal;
use FireflyIII\Models\Rule; use FireflyIII\Models\Rule;
use FireflyIII\Models\RuleGroup; use FireflyIII\Models\RuleGroup;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use FireflyIII\Rules\Processor; use FireflyIII\TransactionRules\Processor;
use FireflyIII\Support\Events\BillScanner; use FireflyIII\Support\Events\BillScanner;
/** /**

2
app/Http/Controllers/RuleController.php
View File

@@ -27,7 +27,7 @@ use FireflyIII\Models\RuleTrigger;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Rule\RuleRepositoryInterface; use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use FireflyIII\Rules\TransactionMatcher; use FireflyIII\TransactionRules\TransactionMatcher;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Preferences; use Preferences;
use Response; use Response;

2
app/Import/Storage/ImportSupport.php
View File

@@ -29,7 +29,7 @@ use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionJournalMeta; use FireflyIII\Models\TransactionJournalMeta;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Tag\TagRepositoryInterface; use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use FireflyIII\Rules\Processor; use FireflyIII\TransactionRules\Processor;
use Illuminate\Database\Query\JoinClause; use Illuminate\Database\Query\JoinClause;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;

2
app/Jobs/ExecuteRuleGroupOnExistingTransactions.php
View File

@@ -16,7 +16,7 @@ namespace FireflyIII\Jobs;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\RuleGroup; use FireflyIII\Models\RuleGroup;
use FireflyIII\Rules\Processor; use FireflyIII\TransactionRules\Processor;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;

2
app/Jobs/ExecuteRuleOnExistingTransactions.php
View File

@@ -14,7 +14,7 @@ namespace FireflyIII\Jobs;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\Rule; use FireflyIII\Models\Rule;
use FireflyIII\Rules\Processor; use FireflyIII\TransactionRules\Processor;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;

40
app/Rules/Uppercase.php
View File

@@ -1,40 +0,0 @@
<?php
namespace FireflyIII\Rules;
use Illuminate\Contracts\Validation\Rule;
class Uppercase implements Rule
{
/**
* Create a new rule instance.
*
* @return void
*/
public function __construct()
{
//
}
/**
* Determine if the validation rule passes.
*
* @param string $attribute
* @param mixed $value
* @return bool
*/
public function passes($attribute, $value)
{
//
}
/**
* Get the validation error message.
*
* @return string
*/
public function message()
{
return 'The validation error message.';
}
}

4
app/Rules/Actions/ActionInterface.php → app/TransactionRules/Actions/ActionInterface.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Actions; namespace FireflyIII\TransactionRules\Actions;
use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleAction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -19,7 +19,7 @@ use FireflyIII\Models\TransactionJournal;
/** /**
* Interface ActionInterface * Interface ActionInterface
* *
* @package FireflyIII\Rules\Action * @package FireflyIII\TransactionRules\Action
*/ */
interface ActionInterface interface ActionInterface
{ {

4
app/Rules/Actions/AddTag.php → app/TransactionRules/Actions/AddTag.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Actions; namespace FireflyIII\TransactionRules\Actions;
use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleAction;
@@ -22,7 +22,7 @@ use Log;
/** /**
* Class AddTag * Class AddTag
* *
* @package FireflyIII\Rules\Actions * @package FireflyIII\TransactionRules\Actions
*/ */
class AddTag implements ActionInterface class AddTag implements ActionInterface
{ {

4
app/Rules/Actions/AppendDescription.php → app/TransactionRules/Actions/AppendDescription.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Actions; namespace FireflyIII\TransactionRules\Actions;
use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleAction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
/** /**
* Class AppendDescription * Class AppendDescription
* *
* @package FireflyIII\Rules\Actions * @package FireflyIII\TransactionRules\Actions
*/ */
class AppendDescription implements ActionInterface class AppendDescription implements ActionInterface
{ {

4
app/Rules/Actions/ClearBudget.php → app/TransactionRules/Actions/ClearBudget.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Actions; namespace FireflyIII\TransactionRules\Actions;
use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleAction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
/** /**
* Class ClearBudget * Class ClearBudget
* *
* @package FireflyIII\Rules\Action * @package FireflyIII\TransactionRules\Action
*/ */
class ClearBudget implements ActionInterface class ClearBudget implements ActionInterface
{ {

4
app/Rules/Actions/ClearCategory.php → app/TransactionRules/Actions/ClearCategory.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Actions; namespace FireflyIII\TransactionRules\Actions;
use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleAction;
@@ -21,7 +21,7 @@ use Log;
/** /**
* Class ClearCategory * Class ClearCategory
* *
* @package FireflyIII\Rules\Action * @package FireflyIII\TransactionRules\Action
*/ */
class ClearCategory implements ActionInterface class ClearCategory implements ActionInterface
{ {

4
app/Rules/Actions/PrependDescription.php → app/TransactionRules/Actions/PrependDescription.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Actions; namespace FireflyIII\TransactionRules\Actions;
use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleAction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
/** /**
* Class AppendDescription * Class AppendDescription
* *
* @package FireflyIII\Rules\Actions * @package FireflyIII\TransactionRules\Actions
*/ */
class PrependDescription implements ActionInterface class PrependDescription implements ActionInterface
{ {

4
app/Rules/Actions/RemoveAllTags.php → app/TransactionRules/Actions/RemoveAllTags.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Actions; namespace FireflyIII\TransactionRules\Actions;
use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleAction;
@@ -21,7 +21,7 @@ use Log;
/** /**
* Class RemoveAllTags * Class RemoveAllTags
* *
* @package FireflyIII\Rules\Actions * @package FireflyIII\TransactionRules\Actions
*/ */
class RemoveAllTags implements ActionInterface class RemoveAllTags implements ActionInterface
{ {

4
app/Rules/Actions/RemoveTag.php → app/TransactionRules/Actions/RemoveTag.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Actions; namespace FireflyIII\TransactionRules\Actions;
use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleAction;
@@ -22,7 +22,7 @@ use Log;
/** /**
* Class RemoveTag * Class RemoveTag
* *
* @package FireflyIII\Rules\Actions * @package FireflyIII\TransactionRules\Actions
*/ */
class RemoveTag implements ActionInterface class RemoveTag implements ActionInterface
{ {

4
app/Rules/Actions/SetBudget.php → app/TransactionRules/Actions/SetBudget.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Actions; namespace FireflyIII\TransactionRules\Actions;
use FireflyIII\Models\Budget; use FireflyIII\Models\Budget;
@@ -24,7 +24,7 @@ use Log;
/** /**
* Class SetBudget * Class SetBudget
* *
* @package FireflyIII\Rules\Action * @package FireflyIII\TransactionRules\Action
*/ */
class SetBudget implements ActionInterface class SetBudget implements ActionInterface
{ {

4
app/Rules/Actions/SetCategory.php → app/TransactionRules/Actions/SetCategory.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Actions; namespace FireflyIII\TransactionRules\Actions;
use FireflyIII\Models\Category; use FireflyIII\Models\Category;
@@ -22,7 +22,7 @@ use Log;
/** /**
* Class SetCategory * Class SetCategory
* *
* @package FireflyIII\Rules\Action * @package FireflyIII\TransactionRules\Action
*/ */
class SetCategory implements ActionInterface class SetCategory implements ActionInterface
{ {

4
app/Rules/Actions/SetDescription.php → app/TransactionRules/Actions/SetDescription.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Actions; namespace FireflyIII\TransactionRules\Actions;
use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleAction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
/** /**
* Class SetDescription * Class SetDescription
* *
* @package FireflyIII\Rules\Actions * @package FireflyIII\TransactionRules\Actions
*/ */
class SetDescription implements ActionInterface class SetDescription implements ActionInterface
{ {

4
app/Rules/Actions/SetDestinationAccount.php → app/TransactionRules/Actions/SetDestinationAccount.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Actions; namespace FireflyIII\TransactionRules\Actions;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
@@ -25,7 +25,7 @@ use Log;
/** /**
* Class SetDestinationAccount * Class SetDestinationAccount
* *
* @package FireflyIII\Rules\Action * @package FireflyIII\TransactionRules\Action
*/ */
class SetDestinationAccount implements ActionInterface class SetDestinationAccount implements ActionInterface
{ {

4
app/Rules/Actions/SetSourceAccount.php → app/TransactionRules/Actions/SetSourceAccount.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Actions; namespace FireflyIII\TransactionRules\Actions;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
@@ -25,7 +25,7 @@ use Log;
/** /**
* Class SetSourceAccount * Class SetSourceAccount
* *
* @package FireflyIII\Rules\Action * @package FireflyIII\TransactionRules\Action
*/ */
class SetSourceAccount implements ActionInterface class SetSourceAccount implements ActionInterface
{ {

8
app/Rules/Factory/ActionFactory.php → app/TransactionRules/Factory/ActionFactory.php
View File

@@ -11,25 +11,25 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Factory; namespace FireflyIII\TransactionRules\Factory;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleAction;
use FireflyIII\Rules\Actions\ActionInterface; use FireflyIII\TransactionRules\Actions\ActionInterface;
use FireflyIII\Support\Domain; use FireflyIII\Support\Domain;
use Log; use Log;
/** /**
* Interface ActionInterface * Interface ActionInterface
* *
* @package FireflyIII\Rules\Actions * @package FireflyIII\TransactionRules\Actions
*/ */
class ActionFactory class ActionFactory
{ {
protected static $actionTypes = []; protected static $actionTypes = [];
/** /**
* This method returns the actual implementation (Rules/Actions/[object]) for a given * This method returns the actual implementation (TransactionRules/Actions/[object]) for a given
* RuleAction (database object). If for example the database object contains action_type "change_category" * RuleAction (database object). If for example the database object contains action_type "change_category"
* with value "Groceries" this method will return a corresponding SetCategory object preset * with value "Groceries" this method will return a corresponding SetCategory object preset
* to "Groceries". Any transaction journal then fed to this object will have its category changed. * to "Groceries". Any transaction journal then fed to this object will have its category changed.

10
app/Rules/Factory/TriggerFactory.php → app/TransactionRules/Factory/TriggerFactory.php
View File

@@ -11,19 +11,19 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Factory; namespace FireflyIII\TransactionRules\Factory;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\RuleTrigger; use FireflyIII\Models\RuleTrigger;
use FireflyIII\Rules\Triggers\AbstractTrigger; use FireflyIII\TransactionRules\Triggers\AbstractTrigger;
use FireflyIII\Rules\Triggers\TriggerInterface; use FireflyIII\TransactionRules\Triggers\TriggerInterface;
use FireflyIII\Support\Domain; use FireflyIII\Support\Domain;
use Log; use Log;
/** /**
* Interface TriggerInterface * Interface TriggerInterface
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
class TriggerFactory class TriggerFactory
{ {
@@ -31,7 +31,7 @@ class TriggerFactory
/** /**
* Returns the trigger for the given type and journal. This method returns the actual implementation * Returns the trigger for the given type and journal. This method returns the actual implementation
* (Rules/Triggers/[object]) for a given RuleTrigger (database object). If for example the database object * (TransactionRules/Triggers/[object]) for a given RuleTrigger (database object). If for example the database object
* contains trigger_type "description_is" with value "Rent" this method will return a corresponding * contains trigger_type "description_is" with value "Rent" this method will return a corresponding
* DescriptionIs object preset to "Rent". Any transaction journal then fed to this object will * DescriptionIs object preset to "Rent". Any transaction journal then fed to this object will
* be triggered if its description actually is "Rent". * be triggered if its description actually is "Rent".

12
app/Rules/Processor.php → app/TransactionRules/Processor.php
View File

@@ -11,24 +11,24 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules; namespace FireflyIII\TransactionRules;
use FireflyIII\Models\Rule; use FireflyIII\Models\Rule;
use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleAction;
use FireflyIII\Models\RuleTrigger; use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Rules\Actions\ActionInterface; use FireflyIII\TransactionRules\Actions\ActionInterface;
use FireflyIII\Rules\Factory\ActionFactory; use FireflyIII\TransactionRules\Factory\ActionFactory;
use FireflyIII\Rules\Factory\TriggerFactory; use FireflyIII\TransactionRules\Factory\TriggerFactory;
use FireflyIII\Rules\Triggers\AbstractTrigger; use FireflyIII\TransactionRules\Triggers\AbstractTrigger;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
/** /**
* Class Processor * Class Processor
* *
* @package FireflyIII\Rules * @package FireflyIII\TransactionRules
*/ */
final class Processor final class Processor
{ {

4
app/Rules/TransactionMatcher.php → app/TransactionRules/TransactionMatcher.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules; namespace FireflyIII\TransactionRules;
use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\Rule; use FireflyIII\Models\Rule;
@@ -25,7 +25,7 @@ use Log;
* Class TransactionMatcher is used to find a list of * Class TransactionMatcher is used to find a list of
* transaction matching a set of triggers * transaction matching a set of triggers
* *
* @package FireflyIII\Rules * @package FireflyIII\TransactionRules
*/ */
class TransactionMatcher class TransactionMatcher
{ {

4
app/Rules/Triggers/AbstractTrigger.php → app/TransactionRules/Triggers/AbstractTrigger.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\RuleTrigger; use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -21,7 +21,7 @@ use FireflyIII\Models\TransactionJournal;
* *
* Class AbstractTrigger * Class AbstractTrigger
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
class AbstractTrigger class AbstractTrigger
{ {

4
app/Rules/Triggers/AmountExactly.php → app/TransactionRules/Triggers/AmountExactly.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
/** /**
* Class AmountExactly * Class AmountExactly
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class AmountExactly extends AbstractTrigger implements TriggerInterface final class AmountExactly extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/AmountLess.php → app/TransactionRules/Triggers/AmountLess.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
/** /**
* Class AmountLess * Class AmountLess
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class AmountLess extends AbstractTrigger implements TriggerInterface final class AmountLess extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/AmountMore.php → app/TransactionRules/Triggers/AmountMore.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
/** /**
* Class AmountMore * Class AmountMore
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class AmountMore extends AbstractTrigger implements TriggerInterface final class AmountMore extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/BudgetIs.php → app/TransactionRules/Triggers/BudgetIs.php
View File

@@ -9,7 +9,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -18,7 +18,7 @@ use Log;
/** /**
* Class BudgetIs * Class BudgetIs
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class BudgetIs extends AbstractTrigger implements TriggerInterface final class BudgetIs extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/CategoryIs.php → app/TransactionRules/Triggers/CategoryIs.php
View File

@@ -9,7 +9,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -18,7 +18,7 @@ use Log;
/** /**
* Class CategoryIs * Class CategoryIs
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class CategoryIs extends AbstractTrigger implements TriggerInterface final class CategoryIs extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/DescriptionContains.php → app/TransactionRules/Triggers/DescriptionContains.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
/** /**
* Class DescriptionContains * Class DescriptionContains
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class DescriptionContains extends AbstractTrigger implements TriggerInterface final class DescriptionContains extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/DescriptionEnds.php → app/TransactionRules/Triggers/DescriptionEnds.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log; use Log;
@@ -19,7 +19,7 @@ use Log;
/** /**
* Class DescriptionEnds * Class DescriptionEnds
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class DescriptionEnds extends AbstractTrigger implements TriggerInterface final class DescriptionEnds extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/DescriptionIs.php → app/TransactionRules/Triggers/DescriptionIs.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log; use Log;
@@ -19,7 +19,7 @@ use Log;
/** /**
* Class DescriptionIs * Class DescriptionIs
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class DescriptionIs extends AbstractTrigger implements TriggerInterface final class DescriptionIs extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/DescriptionStarts.php → app/TransactionRules/Triggers/DescriptionStarts.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log; use Log;
@@ -19,7 +19,7 @@ use Log;
/** /**
* Class DescriptionStarts * Class DescriptionStarts
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class DescriptionStarts extends AbstractTrigger implements TriggerInterface final class DescriptionStarts extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/FromAccountContains.php → app/TransactionRules/Triggers/FromAccountContains.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
/** /**
* Class FromAccountContains * Class FromAccountContains
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class FromAccountContains extends AbstractTrigger implements TriggerInterface final class FromAccountContains extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/FromAccountEnds.php → app/TransactionRules/Triggers/FromAccountEnds.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
/** /**
* Class FromAccountEnds * Class FromAccountEnds
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class FromAccountEnds extends AbstractTrigger implements TriggerInterface final class FromAccountEnds extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/FromAccountIs.php → app/TransactionRules/Triggers/FromAccountIs.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
/** /**
* Class FromAccountIs * Class FromAccountIs
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class FromAccountIs extends AbstractTrigger implements TriggerInterface final class FromAccountIs extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/FromAccountStarts.php → app/TransactionRules/Triggers/FromAccountStarts.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
/** /**
* Class FromAccountStarts * Class FromAccountStarts
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class FromAccountStarts extends AbstractTrigger implements TriggerInterface final class FromAccountStarts extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/HasAnyBudget.php → app/TransactionRules/Triggers/HasAnyBudget.php
View File

@@ -10,7 +10,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log; use Log;
@@ -18,7 +18,7 @@ use Log;
/** /**
* Class HasAnyBudget * Class HasAnyBudget
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class HasAnyBudget extends AbstractTrigger implements TriggerInterface final class HasAnyBudget extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/HasAnyCategory.php → app/TransactionRules/Triggers/HasAnyCategory.php
View File

@@ -10,7 +10,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log; use Log;
@@ -18,7 +18,7 @@ use Log;
/** /**
* Class HasAnyCategory * Class HasAnyCategory
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class HasAnyCategory extends AbstractTrigger implements TriggerInterface final class HasAnyCategory extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/HasAnyTag.php → app/TransactionRules/Triggers/HasAnyTag.php
View File

@@ -10,7 +10,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log; use Log;
@@ -18,7 +18,7 @@ use Log;
/** /**
* Class HasAnyTag * Class HasAnyTag
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class HasAnyTag extends AbstractTrigger implements TriggerInterface final class HasAnyTag extends AbstractTrigger implements TriggerInterface
{ {

2
app/Rules/Triggers/HasAttachment.php → app/TransactionRules/Triggers/HasAttachment.php
View File

@@ -9,7 +9,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;

4
app/Rules/Triggers/HasNoBudget.php → app/TransactionRules/Triggers/HasNoBudget.php
View File

@@ -10,7 +10,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log; use Log;
@@ -18,7 +18,7 @@ use Log;
/** /**
* Class HasNoBudget * Class HasNoBudget
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class HasNoBudget extends AbstractTrigger implements TriggerInterface final class HasNoBudget extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/HasNoCategory.php → app/TransactionRules/Triggers/HasNoCategory.php
View File

@@ -10,7 +10,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log; use Log;
@@ -18,7 +18,7 @@ use Log;
/** /**
* Class HasNoCategory * Class HasNoCategory
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class HasNoCategory extends AbstractTrigger implements TriggerInterface final class HasNoCategory extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/HasNoTag.php → app/TransactionRules/Triggers/HasNoTag.php
View File

@@ -10,7 +10,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log; use Log;
@@ -18,7 +18,7 @@ use Log;
/** /**
* Class HasNoTag * Class HasNoTag
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class HasNoTag extends AbstractTrigger implements TriggerInterface final class HasNoTag extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/TagIs.php → app/TransactionRules/Triggers/TagIs.php
View File

@@ -9,7 +9,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\Tag; use FireflyIII\Models\Tag;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -18,7 +18,7 @@ use Log;
/** /**
* Class TagIs * Class TagIs
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class TagIs extends AbstractTrigger implements TriggerInterface final class TagIs extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/ToAccountContains.php → app/TransactionRules/Triggers/ToAccountContains.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
/** /**
* Class ToAccountContains * Class ToAccountContains
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class ToAccountContains extends AbstractTrigger implements TriggerInterface final class ToAccountContains extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/ToAccountEnds.php → app/TransactionRules/Triggers/ToAccountEnds.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
/** /**
* Class ToAccountEnds * Class ToAccountEnds
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class ToAccountEnds extends AbstractTrigger implements TriggerInterface final class ToAccountEnds extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/ToAccountIs.php → app/TransactionRules/Triggers/ToAccountIs.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
/** /**
* Class ToAccountIs * Class ToAccountIs
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class ToAccountIs extends AbstractTrigger implements TriggerInterface final class ToAccountIs extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/ToAccountStarts.php → app/TransactionRules/Triggers/ToAccountStarts.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -20,7 +20,7 @@ use Log;
/** /**
* Class ToAccountStarts * Class ToAccountStarts
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class ToAccountStarts extends AbstractTrigger implements TriggerInterface final class ToAccountStarts extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/TransactionType.php → app/TransactionRules/Triggers/TransactionType.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log; use Log;
@@ -19,7 +19,7 @@ use Log;
/** /**
* Class TransactionType * Class TransactionType
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class TransactionType extends AbstractTrigger implements TriggerInterface final class TransactionType extends AbstractTrigger implements TriggerInterface
{ {

4
app/Rules/Triggers/TriggerInterface.php → app/TransactionRules/Triggers/TriggerInterface.php
View File

@@ -11,14 +11,14 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
/** /**
* Interface TriggerInterface * Interface TriggerInterface
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
interface TriggerInterface interface TriggerInterface
{ {

4
app/Rules/Triggers/UserAction.php → app/TransactionRules/Triggers/UserAction.php
View File

@@ -11,7 +11,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\TransactionRules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log; use Log;
@@ -19,7 +19,7 @@ use Log;
/** /**
* Class UserAction * Class UserAction
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\TransactionRules\Triggers
*/ */
final class UserAction extends AbstractTrigger implements TriggerInterface final class UserAction extends AbstractTrigger implements TriggerInterface
{ {

2
app/Validation/FireflyValidator.php
View File

@@ -23,7 +23,7 @@ use FireflyIII\Models\Budget;
use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Rules\Triggers\TriggerInterface; use FireflyIII\TransactionRules\Triggers\TriggerInterface;
use FireflyIII\Services\Password\Verifier; use FireflyIII\Services\Password\Verifier;
use FireflyIII\User; use FireflyIII\User;
use Google2FA; use Google2FA;

2
tests/Feature/Controllers/RuleControllerTest.php
View File

@@ -18,7 +18,7 @@ use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\Rule\RuleRepositoryInterface; use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use FireflyIII\Rules\TransactionMatcher; use FireflyIII\TransactionRules\TransactionMatcher;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Tests\TestCase; use Tests\TestCase;