From f7d06b97594b8a40d5b1bfbb305619718a2dbc3a Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 17 Feb 2016 21:59:47 +0100 Subject: [PATCH] Some more code cleanup. --- app/Helpers/Csv/Converter/AssetAccountName.php | 3 +-- app/Rules/Actions/ActionFactory.php | 3 +-- app/Rules/Processor.php | 10 +++++----- app/Rules/Triggers/AbstractTrigger.php | 2 +- resources/lang/nl_NL/firefly.php | 0 resources/lang/nl_NL/form.php | 0 resources/views/rules/partials/test-trigger-modal.twig | 2 +- 7 files changed, 9 insertions(+), 11 deletions(-) mode change 100755 => 100644 resources/lang/nl_NL/firefly.php mode change 100755 => 100644 resources/lang/nl_NL/form.php diff --git a/app/Helpers/Csv/Converter/AssetAccountName.php b/app/Helpers/Csv/Converter/AssetAccountName.php index f14e9a6105..407e54fc6d 100644 --- a/app/Helpers/Csv/Converter/AssetAccountName.php +++ b/app/Helpers/Csv/Converter/AssetAccountName.php @@ -5,7 +5,6 @@ namespace FireflyIII\Helpers\Csv\Converter; use Auth; use Carbon\Carbon; use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; /** * Class AssetAccountName @@ -27,7 +26,7 @@ class AssetAccountName extends BasicConverter implements ConverterInterface return $account; } // find or create new account: - $set = Auth::user()->accounts()->accountTypeIn(['Asset account', 'Default account'])->get(); + $set = Auth::user()->accounts()->accountTypeIn(['Asset account', 'Default account'])->get(); /** @var Account $entry */ foreach ($set as $entry) { if ($entry->name == $this->value) { diff --git a/app/Rules/Actions/ActionFactory.php b/app/Rules/Actions/ActionFactory.php index 1d7ec0e252..75bd45bc35 100644 --- a/app/Rules/Actions/ActionFactory.php +++ b/app/Rules/Actions/ActionFactory.php @@ -12,7 +12,6 @@ namespace FireflyIII\Rules\Actions; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\RuleAction; -use FireflyIII\Models\TransactionJournal; use FireflyIII\Support\Domain; /** @@ -27,7 +26,7 @@ class ActionFactory /** * Returns the action for the given type and journal * - * @param RuleAction $action + * @param RuleAction $action * * @return ActionInterface */ diff --git a/app/Rules/Processor.php b/app/Rules/Processor.php index 73f9f2c8d5..da6f877d40 100644 --- a/app/Rules/Processor.php +++ b/app/Rules/Processor.php @@ -29,13 +29,13 @@ use Log; final class Processor { /** @var Collection */ - private $actions; + public $actions; /** @var TransactionJournal */ - private $journal; + public $journal; /** @var Rule */ - private $rule; + public $rule; /** @var Collection */ - private $triggers; + public $triggers; /** * Processor constructor. @@ -44,7 +44,7 @@ final class Processor private function __construct() { $this->triggers = new Collection; - $this->actions = new Collection; + $this->actions = new Collection; } /** diff --git a/app/Rules/Triggers/AbstractTrigger.php b/app/Rules/Triggers/AbstractTrigger.php index a2d0f65217..764184d56c 100644 --- a/app/Rules/Triggers/AbstractTrigger.php +++ b/app/Rules/Triggers/AbstractTrigger.php @@ -96,4 +96,4 @@ class AbstractTrigger } -} \ No newline at end of file +} diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php old mode 100755 new mode 100644 diff --git a/resources/lang/nl_NL/form.php b/resources/lang/nl_NL/form.php old mode 100755 new mode 100644 diff --git a/resources/views/rules/partials/test-trigger-modal.twig b/resources/views/rules/partials/test-trigger-modal.twig index 8239d0d88f..60e050175d 100644 --- a/resources/views/rules/partials/test-trigger-modal.twig +++ b/resources/views/rules/partials/test-trigger-modal.twig @@ -19,4 +19,4 @@ - \ No newline at end of file +