From 4a12d4d1568298bd6d7d9d8d4e74c9f8b46b9b03 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 6 Jun 2018 21:23:00 +0200 Subject: [PATCH] Code cleanup [skip ci] --- app/Api/V1/Controllers/Controller.php | 2 - app/Api/V1/Controllers/CurrencyController.php | 3 +- app/Api/V1/Requests/BillRequest.php | 4 +- app/Console/Commands/UpgradeDatabase.php | 2 +- app/Console/Commands/VerifyDatabase.php | 8 +- app/Exceptions/Handler.php | 26 ++-- app/Export/ExpandedProcessor.php | 2 +- app/Factory/TransactionCurrencyFactory.php | 1 + app/Factory/TransactionFactory.php | 4 +- app/Handlers/Events/APIEventHandler.php | 1 - .../Attachments/AttachmentHelperInterface.php | 4 +- app/Http/Controllers/BudgetController.php | 2 +- app/Http/Controllers/DebugController.php | 10 +- app/Http/Controllers/RuleController.php | 14 ++- .../Transaction/BulkController.php | 2 +- .../Transaction/ConvertController.php | 5 +- .../Transaction/MassController.php | 9 +- app/Http/Requests/PiggyBankFormRequest.php | 12 +- app/Http/Requests/SplitJournalFormRequest.php | 34 ++--- app/Import/Converter/RabobankDebitCredit.php | 2 +- .../JobConfiguration/FakeJobConfiguration.php | 4 +- .../JobConfiguration/FileJobConfiguration.php | 4 +- .../Prerequisites/BunqPrerequisites.php | 2 +- .../Prerequisites/FakePrerequisites.php | 1 - .../Prerequisites/PrerequisitesInterface.php | 1 - app/Import/Routine/SpectreRoutine.php | 2 +- app/Import/Storage/ImportArrayStorage.php | 2 +- app/Models/Account.php | 6 +- app/Models/AccountMeta.php | 1 - app/Models/AccountType.php | 2 +- app/Models/Attachment.php | 2 +- app/Models/AvailableBudget.php | 3 +- app/Models/Budget.php | 5 +- app/Models/BudgetLimit.php | 1 - app/Models/Category.php | 4 +- app/Models/PiggyBank.php | 4 - app/Models/PiggyBankEvent.php | 2 - app/Models/PiggyBankRepetition.php | 2 +- app/Models/Preference.php | 4 +- app/Models/Role.php | 2 +- app/Models/Rule.php | 12 +- app/Models/RuleAction.php | 1 - app/Models/RuleGroup.php | 4 +- app/Models/Tag.php | 9 +- app/Models/Transaction.php | 2 +- app/Models/TransactionCurrency.php | 3 +- app/Models/TransactionJournal.php | 13 +- app/Models/TransactionJournalMeta.php | 4 +- app/Models/TransactionType.php | 2 +- .../Account/FindAccountsTrait.php | 1 + .../Budget/BudgetRepositoryInterface.php | 18 +-- .../ImportJob/ImportJobRepository.php | 1 + .../ImportJobRepositoryInterface.php | 118 +++++++++--------- .../Journal/JournalRepository.php | 1 - .../Journal/JournalRepositoryInterface.php | 19 +-- .../PiggyBank/PiggyBankRepository.php | 4 +- app/Repositories/Tag/TagRepository.php | 41 +++--- .../Tag/TagRepositoryInterface.php | 26 ++-- app/Services/Spectre/Object/Attempt.php | 4 +- app/Support/Binder/SimpleJournalList.php | 3 +- .../Bunq/BunqJobConfigurationInterface.php | 1 + .../File/ConfigureUploadHandler.php | 104 ++++++++------- .../File/NewFileJobHandler.php | 1 + .../Spectre/ChooseLoginHandler.php | 5 - .../Import/Placeholder/ColumnValue.php | 1 + .../Import/Routine/File/CSVProcessor.php | 2 +- .../Routine/File/FileProcessorInterface.php | 1 + .../Import/Routine/File/LineReader.php | 1 + app/Support/Preferences.php | 2 +- app/Support/Steam.php | 8 +- app/Support/Twig/Extension/Transaction.php | 2 +- app/Support/Twig/General.php | 2 +- app/TransactionRules/Actions/LinkToBill.php | 4 +- .../Actions/SetDestinationAccount.php | 4 +- app/User.php | 35 +++--- 75 files changed, 319 insertions(+), 341 deletions(-) diff --git a/app/Api/V1/Controllers/Controller.php b/app/Api/V1/Controllers/Controller.php index a212ad3029..3b5b3d23b0 100644 --- a/app/Api/V1/Controllers/Controller.php +++ b/app/Api/V1/Controllers/Controller.php @@ -26,8 +26,6 @@ namespace FireflyIII\Api\V1\Controllers; use Carbon\Carbon; use Carbon\Exceptions\InvalidDateException; -use FireflyConfig; -use FireflyIII\Exceptions\FireflyException; use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Foundation\Validation\ValidatesRequests; diff --git a/app/Api/V1/Controllers/CurrencyController.php b/app/Api/V1/Controllers/CurrencyController.php index 176986afb8..42cf032f8c 100644 --- a/app/Api/V1/Controllers/CurrencyController.php +++ b/app/Api/V1/Controllers/CurrencyController.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers; -use FireflyIII\Api\V1\Requests\BillRequest; use FireflyIII\Api\V1\Requests\CurrencyRequest; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\TransactionCurrency; @@ -178,7 +177,7 @@ class CurrencyController extends Controller /** - * @param CurrencyRequest $request + * @param CurrencyRequest $request * @param TransactionCurrency $currency * * @return JsonResponse diff --git a/app/Api/V1/Requests/BillRequest.php b/app/Api/V1/Requests/BillRequest.php index 9f68a656cd..f58c977737 100644 --- a/app/Api/V1/Requests/BillRequest.php +++ b/app/Api/V1/Requests/BillRequest.php @@ -86,8 +86,8 @@ class BillRequest extends Request break; case 'PUT': case 'PATCH': - $bill = $this->route()->parameter('bill'); - $rules['name'] .= ',' . $bill->id; + $bill = $this->route()->parameter('bill'); + $rules['name'] .= ',' . $bill->id; break; } diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php index c4f31d21d2..a533aedf2f 100644 --- a/app/Console/Commands/UpgradeDatabase.php +++ b/app/Console/Commands/UpgradeDatabase.php @@ -184,7 +184,7 @@ class UpgradeDatabase extends Command ] ); } - if($bill->amount_max === $bill->amount_min) { + if ($bill->amount_max === $bill->amount_min) { RuleTrigger::create( [ 'rule_id' => $rule->id, diff --git a/app/Console/Commands/VerifyDatabase.php b/app/Console/Commands/VerifyDatabase.php index 08ec12f3df..00920aaf7f 100644 --- a/app/Console/Commands/VerifyDatabase.php +++ b/app/Console/Commands/VerifyDatabase.php @@ -164,7 +164,8 @@ class VerifyDatabase extends Command if (isset($results[$key]) && $results[$key] !== $category) { $this->error( sprintf( - 'Transaction #%d referred to the wrong category. Was category #%d but is fixed to be category #%d.', $obj->transaction_journal_id, $category, $results[$key] + 'Transaction #%d referred to the wrong category. Was category #%d but is fixed to be category #%d.', $obj->transaction_journal_id, + $category, $results[$key] ) ); DB::table('category_transaction')->where('id', $obj->ct_id)->update(['category_id' => $results[$key]]); @@ -184,14 +185,15 @@ class VerifyDatabase extends Command ->get(['transactions.id', 'transaction_journal_id', 'identifier', 'budget_transaction.budget_id', 'budget_transaction.id as ct_id']); $results = []; foreach ($set as $obj) { - $key = $obj->transaction_journal_id . '-' . $obj->identifier; + $key = $obj->transaction_journal_id . '-' . $obj->identifier; $budget = (int)$obj->budget_id; // value exists and is not budget: if (isset($results[$key]) && $results[$key] !== $budget) { $this->error( sprintf( - 'Transaction #%d referred to the wrong budget. Was budget #%d but is fixed to be budget #%d.', $obj->transaction_journal_id, $budget, $results[$key] + 'Transaction #%d referred to the wrong budget. Was budget #%d but is fixed to be budget #%d.', $obj->transaction_journal_id, $budget, + $results[$key] ) ); DB::table('budget_transaction')->where('id', $obj->ct_id)->update(['budget_id' => $results[$key]]); diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index d66d42a274..59b59b8bdd 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -132,20 +132,20 @@ class Handler extends ExceptionHandler $doMailError = env('SEND_ERROR_MESSAGE', true); if ( // if the user wants us to mail: - $doMailError === true && - (( - // and if is one of these error instances - $exception instanceof FireflyException - || $exception instanceof ErrorException - || $exception instanceof OAuthServerException + $doMailError === true + && (( + // and if is one of these error instances + $exception instanceof FireflyException + || $exception instanceof ErrorException + || $exception instanceof OAuthServerException - ) - || ( - // or this one, but it's a JSON exception. - $exception instanceof AuthenticationException - && Request::expectsJson() === true - )) - ) { + ) + || ( + // or this one, but it's a JSON exception. + $exception instanceof AuthenticationException + && Request::expectsJson() === true + )) + ) { // then, send email $userData = [ 'id' => 0, diff --git a/app/Export/ExpandedProcessor.php b/app/Export/ExpandedProcessor.php index d8ad004f9f..3c964efeba 100644 --- a/app/Export/ExpandedProcessor.php +++ b/app/Export/ExpandedProcessor.php @@ -36,12 +36,12 @@ use FireflyIII\Models\AccountMeta; use FireflyIII\Models\ExportJob; use FireflyIII\Models\Note; use FireflyIII\Models\Transaction; +use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use Illuminate\Support\Collection; use Log; use Storage; use ZipArchive; -use FireflyIII\Models\TransactionJournal; /** * Class ExpandedProcessor. diff --git a/app/Factory/TransactionCurrencyFactory.php b/app/Factory/TransactionCurrencyFactory.php index 3cee423c42..e57e1f81d1 100644 --- a/app/Factory/TransactionCurrencyFactory.php +++ b/app/Factory/TransactionCurrencyFactory.php @@ -71,6 +71,7 @@ class TransactionCurrencyFactory if ('' === $currencyCode && $currencyId === 0) { Log::warning('Cannot find anything on empty currency code and empty currency ID!'); + return null; } diff --git a/app/Factory/TransactionFactory.php b/app/Factory/TransactionFactory.php index 5d1cf3ecef..d9199b0ab1 100644 --- a/app/Factory/TransactionFactory.php +++ b/app/Factory/TransactionFactory.php @@ -97,12 +97,12 @@ class TransactionFactory $description = $journal->description === $data['description'] ? null : $data['description']; // type of source account depends on journal type: - $sourceType = $this->accountType($journal, 'source'); + $sourceType = $this->accountType($journal, 'source'); Log::debug(sprintf('Expect source account to be of type %s', $sourceType)); $sourceAccount = $this->findAccount($sourceType, $data['source_id'], $data['source_name']); // same for destination account: - $destinationType = $this->accountType($journal, 'destination'); + $destinationType = $this->accountType($journal, 'destination'); Log::debug(sprintf('Expect source destination to be of type %s', $destinationType)); $destinationAccount = $this->findAccount($destinationType, $data['destination_id'], $data['destination_name']); // first make a "negative" (source) transaction based on the data in the array. diff --git a/app/Handlers/Events/APIEventHandler.php b/app/Handlers/Events/APIEventHandler.php index 64aa286420..e73b151e86 100644 --- a/app/Handlers/Events/APIEventHandler.php +++ b/app/Handlers/Events/APIEventHandler.php @@ -28,7 +28,6 @@ use Exception; use FireflyIII\Mail\AccessTokenCreatedMail; use FireflyIII\Repositories\User\UserRepositoryInterface; use Laravel\Passport\Events\AccessTokenCreated; -use Laravel\Passport\Token; use Log; use Mail; use Request; diff --git a/app/Helpers/Attachments/AttachmentHelperInterface.php b/app/Helpers/Attachments/AttachmentHelperInterface.php index 276d312a27..03fd095727 100644 --- a/app/Helpers/Attachments/AttachmentHelperInterface.php +++ b/app/Helpers/Attachments/AttachmentHelperInterface.php @@ -37,14 +37,14 @@ interface AttachmentHelperInterface * * @return string */ - public function getAttachmentLocation(Attachment $attachment): string; + public function getAttachmentContent(Attachment $attachment): string; /** * @param Attachment $attachment * * @return string */ - public function getAttachmentContent(Attachment $attachment): string; + public function getAttachmentLocation(Attachment $attachment): string; /** * @return Collection diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index ed199483d5..e8c5f00b19 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -96,7 +96,7 @@ class BudgetController extends Controller // if today is between start and end, use the diff in days between end and today (days left) // otherwise, use diff between start and end. $today = new Carbon; - Log::debug(sprintf('Start is %s, end is %s, today is %s', $start->format('Y-m-d'), $end->format('Y-m-d'),$today->format('Y-m-d'))); + Log::debug(sprintf('Start is %s, end is %s, today is %s', $start->format('Y-m-d'), $end->format('Y-m-d'), $today->format('Y-m-d'))); if ($today->gte($start) && $today->lte($end)) { $days = $end->diffInDays($today); $daysInMonth = $start->diffInDays($today); diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php index 11f52acf5c..3b0a444d23 100644 --- a/app/Http/Controllers/DebugController.php +++ b/app/Http/Controllers/DebugController.php @@ -111,10 +111,12 @@ class DebugController extends Controller return view( 'debug', compact( - 'phpVersion', 'extensions', 'localeAttempts', 'appEnv', 'appDebug', 'appLog', 'appLogLevel', 'now', 'packages', 'drivers', 'currentDriver', - 'userAgent', 'displayErrors', 'errorReporting', 'phpOs', 'interface', 'logContent', 'cacheDriver', 'isDocker', 'isSandstorm', 'trustedProxies', - 'toSandbox' - ) + 'phpVersion', 'extensions', 'localeAttempts', 'appEnv', 'appDebug', 'appLog', 'appLogLevel', 'now', 'packages', 'drivers', + 'currentDriver', + 'userAgent', 'displayErrors', 'errorReporting', 'phpOs', 'interface', 'logContent', 'cacheDriver', 'isDocker', 'isSandstorm', + 'trustedProxies', + 'toSandbox' + ) ); } diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php index 98a781017c..4838a5cc93 100644 --- a/app/Http/Controllers/RuleController.php +++ b/app/Http/Controllers/RuleController.php @@ -23,13 +23,11 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; use Carbon\Carbon; -use ExpandedForm; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Requests\RuleFormRequest; use FireflyIII\Http\Requests\SelectTransactionsRequest; use FireflyIII\Http\Requests\TestRuleFormRequest; use FireflyIII\Jobs\ExecuteRuleOnExistingTransactions; -use FireflyIII\Models\AccountType; use FireflyIII\Models\Bill; use FireflyIII\Models\Rule; use FireflyIII\Models\RuleAction; @@ -331,11 +329,11 @@ class RuleController extends Controller public function selectTransactions(Rule $rule) { // does the user have shared accounts? - $first = session('first')->format('Y-m-d'); - $today = Carbon::create()->format('Y-m-d'); - $subTitle = (string)trans('firefly.apply_rule_selection', ['title' => $rule->title]); + $first = session('first')->format('Y-m-d'); + $today = Carbon::create()->format('Y-m-d'); + $subTitle = (string)trans('firefly.apply_rule_selection', ['title' => $rule->title]); - return view('rules.rule.select-transactions', compact( 'first', 'today', 'rule', 'subTitle')); + return view('rules.rule.select-transactions', compact('first', 'today', 'rule', 'subTitle')); } /** @@ -429,6 +427,7 @@ class RuleController extends Controller Log::error(sprintf('Could not render view in testTriggers(): %s', $exception->getMessage())); Log::error($exception->getTraceAsString()); } + // @codeCoverageIgnoreEnd return response()->json(['html' => $view, 'warning' => $warning]); @@ -490,6 +489,7 @@ class RuleController extends Controller Log::error(sprintf('Could not render view in testTriggersByRule(): %s', $exception->getMessage())); Log::error($exception->getTraceAsString()); } + // @codeCoverageIgnoreEnd return response()->json(['html' => $view, 'warning' => $warning]); @@ -600,6 +600,7 @@ class RuleController extends Controller Log::error(sprintf('Throwable was thrown in getActionsForBill(): %s', $e->getMessage())); Log::error($e->getTraceAsString()); } + // @codeCoverageIgnoreEnd return $actions; @@ -809,6 +810,7 @@ class RuleController extends Controller Log::debug(sprintf('Throwable was thrown in getTriggersForBill(): %s', $e->getMessage())); Log::debug($e->getTraceAsString()); } + // @codeCoverageIgnoreEnd return $triggers; diff --git a/app/Http/Controllers/Transaction/BulkController.php b/app/Http/Controllers/Transaction/BulkController.php index b1dcce8f4e..aeac8035ea 100644 --- a/app/Http/Controllers/Transaction/BulkController.php +++ b/app/Http/Controllers/Transaction/BulkController.php @@ -87,7 +87,7 @@ class BulkController extends Controller /** - * @param BulkEditJournalRequest $request + * @param BulkEditJournalRequest $request * * @return mixed */ diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php index 1b09ccc760..b6ffe94897 100644 --- a/app/Http/Controllers/Transaction/ConvertController.php +++ b/app/Http/Controllers/Transaction/ConvertController.php @@ -98,8 +98,9 @@ class ConvertController extends Controller return view( 'transactions.convert', compact( - 'sourceType', 'destinationType', 'journal', 'positiveAmount', 'sourceAccount', 'destinationAccount', 'sourceType', 'subTitle', 'subTitleIcon' - ) + 'sourceType', 'destinationType', 'journal', 'positiveAmount', 'sourceAccount', 'destinationAccount', 'sourceType', + 'subTitle', 'subTitleIcon' + ) ); } diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index 8b78a9ccb9..198cfc64ba 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -24,7 +24,6 @@ namespace FireflyIII\Http\Controllers\Transaction; use Carbon\Carbon; use FireflyIII\Helpers\Collector\JournalCollectorInterface; -use FireflyIII\Helpers\Filter\NegativeAmountFilter; use FireflyIII\Helpers\Filter\TransactionViewFilter; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\MassDeleteJournalRequest; @@ -37,10 +36,9 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Transformers\TransactionTransformer; use Illuminate\Support\Collection; +use Illuminate\View\View as IlluminateView; use Preferences; use Symfony\Component\HttpFoundation\ParameterBag; -use View; -use Illuminate\View\View as IlluminateView; /** * Class MassController. @@ -155,10 +153,11 @@ class MassController extends Controller // transform to array $transactions = $collection->map( function (Transaction $transaction) use ($transformer) { - $transaction= $transformer->transform($transaction); + $transaction = $transformer->transform($transaction); // make sure amount is positive: - $transaction['amount'] = app('steam')->positive((string)$transaction['amount']); + $transaction['amount'] = app('steam')->positive((string)$transaction['amount']); $transaction['foreign_amount'] = app('steam')->positive((string)$transaction['foreign_amount']); + return $transaction; } ); diff --git a/app/Http/Requests/PiggyBankFormRequest.php b/app/Http/Requests/PiggyBankFormRequest.php index fae23428f7..bd6488edd5 100644 --- a/app/Http/Requests/PiggyBankFormRequest.php +++ b/app/Http/Requests/PiggyBankFormRequest.php @@ -62,12 +62,12 @@ class PiggyBankFormRequest extends Request } $rules = [ - 'name' => $nameRule, - 'account_id' => 'required|belongsToUser:accounts', - 'targetamount' => 'required|numeric|more:0', - 'startdate' => 'date', - 'targetdate' => 'date|nullable', - 'order' => 'integer|min:1', + 'name' => $nameRule, + 'account_id' => 'required|belongsToUser:accounts', + 'targetamount' => 'required|numeric|more:0', + 'startdate' => 'date', + 'targetdate' => 'date|nullable', + 'order' => 'integer|min:1', ]; return $rules; diff --git a/app/Http/Requests/SplitJournalFormRequest.php b/app/Http/Requests/SplitJournalFormRequest.php index ce99023a1f..207754df5b 100644 --- a/app/Http/Requests/SplitJournalFormRequest.php +++ b/app/Http/Requests/SplitJournalFormRequest.php @@ -109,23 +109,23 @@ class SplitJournalFormRequest extends Request public function rules(): array { return [ - 'what' => 'required|in:withdrawal,deposit,transfer', - 'journal_description' => 'required|between:1,255', - 'id' => 'numeric|belongsToUser:transaction_journals,id', - 'journal_source_account_id' => 'numeric|belongsToUser:accounts,id', - 'journal_source_account_name.*' => 'between:1,255', - 'journal_currency_id' => 'required|exists:transaction_currencies,id', - 'date' => 'required|date', - 'interest_date' => 'date|nullable', - 'book_date' => 'date|nullable', - 'process_date' => 'date|nullable', - 'transactions.*.transaction_description' => 'required|between:1,255', - 'transactions.*.destination_account_id' => 'numeric|belongsToUser:accounts,id', - 'transactions.*.destination_name' => 'between:1,255|nullable', - 'transactions.*.amount' => 'required|numeric', - 'transactions.*.budget_id' => 'belongsToUser:budgets,id', - 'transactions.*.category_name' => 'between:1,255|nullable', - 'transactions.*.piggy_bank_id' => 'between:1,255|nullable', + 'what' => 'required|in:withdrawal,deposit,transfer', + 'journal_description' => 'required|between:1,255', + 'id' => 'numeric|belongsToUser:transaction_journals,id', + 'journal_source_account_id' => 'numeric|belongsToUser:accounts,id', + 'journal_source_account_name.*' => 'between:1,255', + 'journal_currency_id' => 'required|exists:transaction_currencies,id', + 'date' => 'required|date', + 'interest_date' => 'date|nullable', + 'book_date' => 'date|nullable', + 'process_date' => 'date|nullable', + 'transactions.*.transaction_description' => 'required|between:1,255', + 'transactions.*.destination_account_id' => 'numeric|belongsToUser:accounts,id', + 'transactions.*.destination_name' => 'between:1,255|nullable', + 'transactions.*.amount' => 'required|numeric', + 'transactions.*.budget_id' => 'belongsToUser:budgets,id', + 'transactions.*.category_name' => 'between:1,255|nullable', + 'transactions.*.piggy_bank_id' => 'between:1,255|nullable', ]; } diff --git a/app/Import/Converter/RabobankDebitCredit.php b/app/Import/Converter/RabobankDebitCredit.php index d426e52b5b..764a7f907e 100644 --- a/app/Import/Converter/RabobankDebitCredit.php +++ b/app/Import/Converter/RabobankDebitCredit.php @@ -44,7 +44,7 @@ class RabobankDebitCredit implements ConverterInterface return -1; } // old format: - if('A' === $value) { + if ('A' === $value) { Log::debug('Return -1'); return -1; diff --git a/app/Import/JobConfiguration/FakeJobConfiguration.php b/app/Import/JobConfiguration/FakeJobConfiguration.php index 81a96adfd7..3812a78d59 100644 --- a/app/Import/JobConfiguration/FakeJobConfiguration.php +++ b/app/Import/JobConfiguration/FakeJobConfiguration.php @@ -106,6 +106,7 @@ class FakeJobConfiguration implements JobConfigurationInterface /** * Return the data required for the next step in the job configuration. + * * @codeCoverageIgnore * @return array */ @@ -144,6 +145,7 @@ class FakeJobConfiguration implements JobConfigurationInterface if (strtolower($album) !== 'station to station' && $this->importJob->stage !== 'new') { return 'import.fake.enter-album'; } + return 'impossible-view'; // @codeCoverageIgnore } @@ -152,7 +154,7 @@ class FakeJobConfiguration implements JobConfigurationInterface */ public function setImportJob(ImportJob $importJob): void { - $this->importJob = $importJob; + $this->importJob = $importJob; $this->repository = app(ImportJobRepositoryInterface::class); $this->repository->setUser($importJob->user); } diff --git a/app/Import/JobConfiguration/FileJobConfiguration.php b/app/Import/JobConfiguration/FileJobConfiguration.php index cfc1d18966..5820b38951 100644 --- a/app/Import/JobConfiguration/FileJobConfiguration.php +++ b/app/Import/JobConfiguration/FileJobConfiguration.php @@ -28,10 +28,10 @@ namespace FireflyIII\Import\JobConfiguration; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\ImportJob; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use FireflyIII\Support\Import\JobConfiguration\File\FileConfigurationInterface; use FireflyIII\Support\Import\JobConfiguration\File\ConfigureMappingHandler; use FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler; use FireflyIII\Support\Import\JobConfiguration\File\ConfigureUploadHandler; +use FireflyIII\Support\Import\JobConfiguration\File\FileConfigurationInterface; use FireflyIII\Support\Import\JobConfiguration\File\NewFileJobHandler; use Illuminate\Support\MessageBag; @@ -120,7 +120,7 @@ class FileJobConfiguration implements JobConfigurationInterface */ public function setImportJob(ImportJob $importJob): void { - $this->importJob = $importJob; + $this->importJob = $importJob; $this->repository = app(ImportJobRepositoryInterface::class); $this->repository->setUser($importJob->user); } diff --git a/app/Import/Prerequisites/BunqPrerequisites.php b/app/Import/Prerequisites/BunqPrerequisites.php index ea39453f3a..96fd3ad672 100644 --- a/app/Import/Prerequisites/BunqPrerequisites.php +++ b/app/Import/Prerequisites/BunqPrerequisites.php @@ -119,7 +119,7 @@ class BunqPrerequisites implements PrerequisitesInterface try { /** @var ApiContext $object */ - $object = app(ApiContext::class); + $object = app(ApiContext::class); $apiContext = $object->create($environment, $apiKey, $deviceDescription, $permittedIps); } catch (FireflyException $e) { $messages = new MessageBag(); diff --git a/app/Import/Prerequisites/FakePrerequisites.php b/app/Import/Prerequisites/FakePrerequisites.php index ac8c07affb..86642e8066 100644 --- a/app/Import/Prerequisites/FakePrerequisites.php +++ b/app/Import/Prerequisites/FakePrerequisites.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Import\Prerequisites; use FireflyIII\User; -use Illuminate\Http\Request; use Illuminate\Support\MessageBag; /** diff --git a/app/Import/Prerequisites/PrerequisitesInterface.php b/app/Import/Prerequisites/PrerequisitesInterface.php index 588821eeca..f3f82ae5be 100644 --- a/app/Import/Prerequisites/PrerequisitesInterface.php +++ b/app/Import/Prerequisites/PrerequisitesInterface.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Import\Prerequisites; use FireflyIII\User; -use Illuminate\Http\Request; use Illuminate\Support\MessageBag; /** diff --git a/app/Import/Routine/SpectreRoutine.php b/app/Import/Routine/SpectreRoutine.php index 1c51d8d697..83aea2664a 100644 --- a/app/Import/Routine/SpectreRoutine.php +++ b/app/Import/Routine/SpectreRoutine.php @@ -25,8 +25,8 @@ namespace FireflyIII\Import\Routine; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\ImportJob; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use FireflyIII\Support\Import\Routine\Spectre\StageImportDataHandler; use FireflyIII\Support\Import\Routine\Spectre\StageAuthenticatedHandler; +use FireflyIII\Support\Import\Routine\Spectre\StageImportDataHandler; use FireflyIII\Support\Import\Routine\Spectre\StageNewHandler; use Log; diff --git a/app/Import/Storage/ImportArrayStorage.php b/app/Import/Storage/ImportArrayStorage.php index 01315fbe9f..2754ad94df 100644 --- a/app/Import/Storage/ImportArrayStorage.php +++ b/app/Import/Storage/ImportArrayStorage.php @@ -215,7 +215,7 @@ class ImportArrayStorage $collector = app(JournalCollectorInterface::class); $collector->setUser($this->importJob->user); $collector->setAllAssetAccounts() - ->ignoreCache() + ->ignoreCache() ->setTypes([TransactionType::TRANSFER]) ->withOpposingAccount(); $collector->removeFilter(InternalTransferFilter::class); diff --git a/app/Models/Account.php b/app/Models/Account.php index 1e79b0aa2c..3a0897258c 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -38,9 +38,9 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** * Class Account. * - * @property int $id - * @property string $name - * @property string $iban + * @property int $id + * @property string $name + * @property string $iban * @property AccountType $accountType */ class Account extends Model diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index aa5bb522fd..cd087f969b 100644 --- a/app/Models/AccountMeta.php +++ b/app/Models/AccountMeta.php @@ -24,7 +24,6 @@ namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; -use FireflyIII\Models\Account; /** * Class AccountMeta. diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index 9729d5a34f..de1d5794cd 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -24,10 +24,10 @@ namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; -use FireflyIII\Models\Account; /** * Class AccountType. + * * @property string $type * */ diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php index 2c1a1e61b6..044283cbdb 100644 --- a/app/Models/Attachment.php +++ b/app/Models/Attachment.php @@ -23,12 +23,12 @@ declare(strict_types=1); namespace FireflyIII\Models; use Crypt; +use FireflyIII\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use FireflyIII\User; /** * Class Attachment. diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php index 1e74d00af1..2f023f4ad5 100644 --- a/app/Models/AvailableBudget.php +++ b/app/Models/AvailableBudget.php @@ -22,11 +22,10 @@ declare(strict_types=1); namespace FireflyIII\Models; +use FireflyIII\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; -use FireflyIII\User; -use FireflyIII\Models\TransactionCurrency; /** * Class AvailableBudget. diff --git a/app/Models/Budget.php b/app/Models/Budget.php index 6fc3e3d6f4..60f80da5f3 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -23,14 +23,11 @@ declare(strict_types=1); namespace FireflyIII\Models; use Crypt; +use FireflyIII\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use FireflyIII\User; -use FireflyIII\Models\Transaction; -use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\BudgetLimit; /** * Class Budget. diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php index 615c2d90ee..2934a5b6f5 100644 --- a/app/Models/BudgetLimit.php +++ b/app/Models/BudgetLimit.php @@ -24,7 +24,6 @@ namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use FireflyIII\Models\Budget; /** * Class BudgetLimit. diff --git a/app/Models/Category.php b/app/Models/Category.php index 2e2f0aaf26..068c12934b 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -23,13 +23,11 @@ declare(strict_types=1); namespace FireflyIII\Models; use Crypt; +use FireflyIII\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use FireflyIII\User; -use FireflyIII\Models\Transaction; -use FireflyIII\Models\TransactionJournal; /** * Class Category. diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 4e13b540c5..e5b8c30a37 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -29,10 +29,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; use Steam; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use FireflyIII\Models\PiggyBankRepetition; -use FireflyIII\Models\PiggyBankEvent; -use FireflyIII\Models\Note; -use FireflyIII\Models\Account; /** * Class PiggyBank. diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index 9463fcc39c..0f9f364766 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; -use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\PiggyBank; /** * Class PiggyBankEvent. diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index 3efac08652..42494f1f9e 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -25,10 +25,10 @@ namespace FireflyIII\Models; use Carbon\Carbon; use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Model; -use FireflyIII\Models\PiggyBank; /** * Class PiggyBankRepetition. + * * @property string $currentamount */ class PiggyBankRepetition extends Model diff --git a/app/Models/Preference.php b/app/Models/Preference.php index 3a873f7086..7182c9728e 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -25,15 +25,15 @@ namespace FireflyIII\Models; use Crypt; use Exception; use FireflyIII\Exceptions\FireflyException; +use FireflyIII\User; use Illuminate\Contracts\Encryption\DecryptException; use Illuminate\Database\Eloquent\Model; use Log; -use FireflyIII\User; /** * Class Preference. * - * @property mixed $data + * @property mixed $data * @property string $name */ class Preference extends Model diff --git a/app/Models/Role.php b/app/Models/Role.php index 02fcfb5a5d..ee735d4605 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -22,9 +22,9 @@ declare(strict_types=1); namespace FireflyIII\Models; +use FireflyIII\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsToMany; -use FireflyIII\User; /** * Class Role. diff --git a/app/Models/Rule.php b/app/Models/Rule.php index e6e65ba73e..7f38e31824 100644 --- a/app/Models/Rule.php +++ b/app/Models/Rule.php @@ -22,18 +22,16 @@ declare(strict_types=1); namespace FireflyIII\Models; +use FireflyIII\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use FireflyIII\User; -use FireflyIII\Models\RuleTrigger; -use FireflyIII\Models\RuleGroup; -use FireflyIII\Models\RuleAction; /** * Class Rule. - * @property bool $stop_processing - * @property int $id + * + * @property bool $stop_processing + * @property int $id * @property \Illuminate\Support\Collection $ruleTriggers */ class Rule extends Model @@ -56,7 +54,7 @@ class Rule extends Model 'strict' => 'boolean', ]; /** @var array */ - protected $fillable = ['rule_group_id', 'order', 'active', 'title', 'description', 'user_id','strict']; + protected $fillable = ['rule_group_id', 'order', 'active', 'title', 'description', 'user_id', 'strict']; /** * @param string $value diff --git a/app/Models/RuleAction.php b/app/Models/RuleAction.php index d498ee11f6..da9e6c048a 100644 --- a/app/Models/RuleAction.php +++ b/app/Models/RuleAction.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; -use FireflyIII\Models\Rule; /** * Class RuleAction. diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php index cfe4ae2c35..149b12fc4d 100644 --- a/app/Models/RuleGroup.php +++ b/app/Models/RuleGroup.php @@ -22,14 +22,14 @@ declare(strict_types=1); namespace FireflyIII\Models; +use FireflyIII\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use FireflyIII\User; -use FireflyIII\Models\Rule; /** * Class RuleGroup. + * * @property bool $active */ class RuleGroup extends Model diff --git a/app/Models/Tag.php b/app/Models/Tag.php index 9a085b0325..a60b07449b 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -23,19 +23,18 @@ declare(strict_types=1); namespace FireflyIII\Models; use Crypt; +use FireflyIII\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Collection; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use FireflyIII\User; -use FireflyIII\Models\TransactionJournal; /** * Class Tag. * - * @property Collection $transactionJournals - * @property string $tag - * @property int $id + * @property Collection $transactionJournals + * @property string $tag + * @property int $id * @property \Carbon\Carbon $date */ class Tag extends Model diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index b591f1d956..df124b1041 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -71,7 +71,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property string $description * @property bool $is_split * @property int $attachmentCount - * @property int $transaction_currency_id + * @property int $transaction_currency_id */ class Transaction extends Model { diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index 439962a257..829d5e9876 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -25,13 +25,12 @@ namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use FireflyIII\Models\TransactionJournal; /** * Class TransactionCurrency. * * @property string $code - * @property int $decimal_places + * @property int $decimal_places * */ class TransactionCurrency extends Model diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 40595f644d..e54c69266f 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -35,23 +35,12 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Log; use Preferences; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use FireflyIII\Models\Transaction; -use FireflyIII\Models\TransactionType; -use FireflyIII\Models\TransactionJournalMeta; -use FireflyIII\Models\TransactionCurrency; -use FireflyIII\Models\Tag; -use FireflyIII\Models\PiggyBankEvent; -use FireflyIII\Models\Note; -use FireflyIII\Models\Category; -use FireflyIII\Models\Budget; -use FireflyIII\Models\Bill; -use FireflyIII\Models\Attachment; /** * Class TransactionJournal. * * @property User $user - * @property int $bill_id + * @property int $bill_id */ class TransactionJournal extends Model { diff --git a/app/Models/TransactionJournalMeta.php b/app/Models/TransactionJournalMeta.php index bef13e7fa8..e6acea708f 100644 --- a/app/Models/TransactionJournalMeta.php +++ b/app/Models/TransactionJournalMeta.php @@ -25,12 +25,12 @@ namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; -use FireflyIII\Models\TransactionJournal; /** * Class TransactionJournalMeta. + * * @property string $name - * @property int $transaction_journal_id + * @property int $transaction_journal_id */ class TransactionJournalMeta extends Model { diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index 67a1b906e1..756921cbf7 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -25,10 +25,10 @@ namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use FireflyIII\Models\TransactionJournal; /** * Class TransactionType. + * * @property string $type */ class TransactionType extends Model diff --git a/app/Repositories/Account/FindAccountsTrait.php b/app/Repositories/Account/FindAccountsTrait.php index 79451ff6e4..de9b338488 100644 --- a/app/Repositories/Account/FindAccountsTrait.php +++ b/app/Repositories/Account/FindAccountsTrait.php @@ -58,6 +58,7 @@ trait FindAccountsTrait /** * @param string $number * @param array $types + * * @return Account|null */ public function findByAccountNumber(string $number, array $types): ?Account diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index a929e92484..e2197b76ba 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -35,15 +35,6 @@ use Illuminate\Support\Collection; interface BudgetRepositoryInterface { - /** - * Get all budgets with these ID's. - * - * @param array $budgetIds - * - * @return Collection - */ - public function getByIds(array $budgetIds): Collection; - /** * A method that returns the amount of money budgeted per day for this budget, * on average. @@ -174,6 +165,15 @@ interface BudgetRepositoryInterface */ public function getBudgets(): Collection; + /** + * Get all budgets with these ID's. + * + * @param array $budgetIds + * + * @return Collection + */ + public function getByIds(array $budgetIds): Collection; + /** * @return Collection */ diff --git a/app/Repositories/ImportJob/ImportJobRepository.php b/app/Repositories/ImportJob/ImportJobRepository.php index 4d42698aec..7bf69d8a18 100644 --- a/app/Repositories/ImportJob/ImportJobRepository.php +++ b/app/Repositories/ImportJob/ImportJobRepository.php @@ -360,6 +360,7 @@ class ImportJobRepository implements ImportJobRepositoryInterface $newConfig = array_merge($currentConfig, $configuration); $job->configuration = $newConfig; $job->save(); + //Log::debug(sprintf('Set config of job "%s" to: ', $job->key), $newConfig); return $job; diff --git a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php index baf1d51ce1..fd5ccd1d5e 100644 --- a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php +++ b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php @@ -36,52 +36,13 @@ use Symfony\Component\HttpFoundation\File\UploadedFile; interface ImportJobRepositoryInterface { /** - * Return all attachments for job. - * * @param ImportJob $job - * - * @return Collection - */ - public function getAttachments(ImportJob $job): Collection; - - /** - * Handle upload for job. - * - * @param ImportJob $job - * @param string $name - * @param UploadedFile $file - * - * @return MessageBag - * @throws FireflyException - */ - public function storeFileUpload(ImportJob $job, string $name, UploadedFile $file): MessageBag; - - /** - * Store file. - * - * @param ImportJob $job - * @param string $name - * @param string $fileName - * - * @return MessageBag - */ - public function storeCLIUpload(ImportJob $job, string $name, string $fileName): MessageBag; - - /** - * @param ImportJob $job - * @param array $transactions + * @param int $index + * @param string $error * * @return ImportJob */ - public function setTransactions(ImportJob $job, array $transactions): ImportJob; - - /** - * @param ImportJob $job - * @param Tag $tag - * - * @return ImportJob - */ - public function setTag(ImportJob $job, Tag $tag): ImportJob; + public function addError(ImportJob $job, int $index, string $error): ImportJob; /** * Add message to job. @@ -93,15 +54,6 @@ interface ImportJobRepositoryInterface */ public function addErrorMessage(ImportJob $job, string $error): ImportJob; - /** - * @param ImportJob $job - * @param int $index - * @param string $error - * - * @return ImportJob - */ - public function addError(ImportJob $job, int $index, string $error): ImportJob; - /** * @param ImportJob $job * @param int $steps @@ -141,6 +93,15 @@ interface ImportJobRepositoryInterface */ public function findByKey(string $key): ImportJob; + /** + * Return all attachments for job. + * + * @param ImportJob $job + * + * @return Collection + */ + public function getAttachments(ImportJob $job): Collection; + /** * Return configuration of job. * @@ -198,14 +159,6 @@ interface ImportJobRepositoryInterface */ public function setExtendedStatus(ImportJob $job, array $array): ImportJob; - /** - * @param ImportJob $job - * @param string $status - * - * @return ImportJob - */ - public function setStatus(ImportJob $job, string $status): ImportJob; - /** * @param ImportJob $job * @param string $stage @@ -214,6 +167,14 @@ interface ImportJobRepositoryInterface */ public function setStage(ImportJob $job, string $stage): ImportJob; + /** + * @param ImportJob $job + * @param string $status + * + * @return ImportJob + */ + public function setStatus(ImportJob $job, string $status): ImportJob; + /** * @param ImportJob $job * @param int $steps @@ -222,6 +183,14 @@ interface ImportJobRepositoryInterface */ public function setStepsDone(ImportJob $job, int $steps): ImportJob; + /** + * @param ImportJob $job + * @param Tag $tag + * + * @return ImportJob + */ + public function setTag(ImportJob $job, Tag $tag): ImportJob; + /** * @param ImportJob $job * @param int $count @@ -230,11 +199,42 @@ interface ImportJobRepositoryInterface */ public function setTotalSteps(ImportJob $job, int $count): ImportJob; + /** + * @param ImportJob $job + * @param array $transactions + * + * @return ImportJob + */ + public function setTransactions(ImportJob $job, array $transactions): ImportJob; + /** * @param User $user */ public function setUser(User $user); + /** + * Store file. + * + * @param ImportJob $job + * @param string $name + * @param string $fileName + * + * @return MessageBag + */ + public function storeCLIUpload(ImportJob $job, string $name, string $fileName): MessageBag; + + /** + * Handle upload for job. + * + * @param ImportJob $job + * @param string $name + * @param UploadedFile $file + * + * @return MessageBag + * @throws FireflyException + */ + public function storeFileUpload(ImportJob $job, string $name, UploadedFile $file): MessageBag; + /** * @param ImportJob $job * @param string $status diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index e5dc693a60..6f71187a31 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Repositories\Journal; use Carbon\Carbon; -use DB; use Exception; use FireflyIII\Factory\TransactionJournalFactory; use FireflyIII\Factory\TransactionJournalMetaFactory; diff --git a/app/Repositories/Journal/JournalRepositoryInterface.php b/app/Repositories/Journal/JournalRepositoryInterface.php index 33ea68806d..1c55997a76 100644 --- a/app/Repositories/Journal/JournalRepositoryInterface.php +++ b/app/Repositories/Journal/JournalRepositoryInterface.php @@ -38,15 +38,6 @@ use Illuminate\Support\MessageBag; */ interface JournalRepositoryInterface { - /** - * Find a journal by its hash. - * - * @param string $hash - * - * @return TransactionJournalMeta|null - */ - public function findByHash(string $hash): ?TransactionJournalMeta; - /** * @param TransactionJournal $journal * @param TransactionType $type @@ -77,12 +68,22 @@ interface JournalRepositoryInterface * Find a specific journal. * * @param int $journalId + * * @deprecated * * @return TransactionJournal */ public function find(int $journalId): TransactionJournal; + /** + * Find a journal by its hash. + * + * @param string $hash + * + * @return TransactionJournalMeta|null + */ + public function findByHash(string $hash): ?TransactionJournalMeta; + /** * Find a specific journal. * diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index 677b48c23e..401d53d4b1 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -334,8 +334,8 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface public function getSuggestedMonthlyAmount(PiggyBank $piggyBank): string { $savePerMonth = '0'; - $repetition = $this->getRepetition($piggyBank); - if(null === $repetition) { + $repetition = $this->getRepetition($piggyBank); + if (null === $repetition) { return $savePerMonth; } if (null !== $piggyBank->targetdate && $repetition->currentamount < $piggyBank->targetamount) { diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index 90c545cb58..2cefe02b68 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -136,6 +136,16 @@ class TagRepository implements TagRepositoryInterface return new Tag; } + /** + * @param int $tagId + * + * @return Tag|null + */ + public function findNull(int $tagId): ?Tag + { + return $this->user->tags()->find($tagId); + } + /** * @param Tag $tag * @@ -192,6 +202,16 @@ class TagRepository implements TagRepositoryInterface return new Carbon; } + /** + * Will return the newest tag (if known) or NULL. + * + * @return Tag|null + */ + public function newestTag(): ?Tag + { + return $this->user->tags()->whereNotNull('date')->orderBy('date', 'DESC')->first(); + } + /** * @return Tag */ @@ -453,23 +473,4 @@ class TagRepository implements TagRepositoryInterface return (int)($range[0] + $extra); } - - /** - * @param int $tagId - * - * @return Tag|null - */ - public function findNull(int $tagId): ?Tag - { - return $this->user->tags()->find($tagId); - } - - /** - * Will return the newest tag (if known) or NULL. - * - * @return Tag|null - */ - public function newestTag(): ?Tag - { - return $this->user->tags()->whereNotNull('date')->orderBy('date', 'DESC')->first(); -}} +} diff --git a/app/Repositories/Tag/TagRepositoryInterface.php b/app/Repositories/Tag/TagRepositoryInterface.php index e4e8b44ba5..3b6b7cd19a 100644 --- a/app/Repositories/Tag/TagRepositoryInterface.php +++ b/app/Repositories/Tag/TagRepositoryInterface.php @@ -69,12 +69,6 @@ interface TagRepositoryInterface /** * @param int $tagId * - * @return Tag|null - */ - public function findNull(int $tagId): ?Tag; - - /** - * @param int $tagId * @deprecated * @return Tag */ @@ -87,6 +81,13 @@ interface TagRepositoryInterface */ public function findByTag(string $tag): Tag; + /** + * @param int $tagId + * + * @return Tag|null + */ + public function findNull(int $tagId): ?Tag; + /** * @param Tag $tag * @@ -117,15 +118,18 @@ interface TagRepositoryInterface /** * Will return the newest tag (if known) or NULL. + * + * @return Tag|null + */ + public function newestTag(): ?Tag; + + /** + * Will return the newest tag (if known) or NULL. + * * @return Tag|null */ public function oldestTag(): ?Tag; - /** - * Will return the newest tag (if known) or NULL. - * @return Tag|null - */ - public function newestTag(): ?Tag; /** * @param User $user */ diff --git a/app/Services/Spectre/Object/Attempt.php b/app/Services/Spectre/Object/Attempt.php index 6aecd25246..495fa9566e 100644 --- a/app/Services/Spectre/Object/Attempt.php +++ b/app/Services/Spectre/Object/Attempt.php @@ -87,9 +87,9 @@ class Attempt extends SpectreObject private $successAt; /** @var Carbon */ private $toDate; - /** @var Carbon */ + /** @var Carbon */ private $updatedAt; // undocumented -/** @var string */ + /** @var string */ private $userAgent; /** diff --git a/app/Support/Binder/SimpleJournalList.php b/app/Support/Binder/SimpleJournalList.php index c356331b48..070aa6dd06 100644 --- a/app/Support/Binder/SimpleJournalList.php +++ b/app/Support/Binder/SimpleJournalList.php @@ -28,7 +28,6 @@ use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Routing\Route; use Illuminate\Support\Collection; -use Session; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** @@ -58,7 +57,7 @@ class SimpleJournalList implements BinderInterface // prep some vars $messages = []; - $final = new Collection; + $final = new Collection; /** @var JournalRepositoryInterface $repository */ $repository = app(JournalRepositoryInterface::class); diff --git a/app/Support/Import/JobConfiguration/Bunq/BunqJobConfigurationInterface.php b/app/Support/Import/JobConfiguration/Bunq/BunqJobConfigurationInterface.php index 3a52f6af99..dc85d3b541 100644 --- a/app/Support/Import/JobConfiguration/Bunq/BunqJobConfigurationInterface.php +++ b/app/Support/Import/JobConfiguration/Bunq/BunqJobConfigurationInterface.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace FireflyIII\Support\Import\JobConfiguration\Bunq; + use FireflyIII\Models\ImportJob; use Illuminate\Support\MessageBag; diff --git a/app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php b/app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php index 144d472f86..76962d0132 100644 --- a/app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php +++ b/app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php @@ -35,61 +35,12 @@ use Log; */ class ConfigureUploadHandler implements FileConfigurationInterface { - /** @var ImportJob */ - private $importJob; - - /** @var ImportJobRepositoryInterface */ - private $repository; - /** @var AccountRepositoryInterface */ private $accountRepos; - - /** - * Get the data necessary to show the configuration screen. - * - * @return array - */ - public function getNextData(): array - { - $delimiters = [ - ',' => trans('form.csv_comma'), - ';' => trans('form.csv_semicolon'), - 'tab' => trans('form.csv_tab'), - ]; - $config = $this->importJob->configuration; - $config['date-format'] = $config['date-format'] ?? 'Ymd'; - $specifics = []; - $this->repository->setConfiguration($this->importJob, $config); - - // collect specifics. - foreach (config('csv.import_specifics') as $name => $className) { - $specifics[$name] = [ - 'name' => trans($className::getName()), - 'description' => trans($className::getDescription()), - ]; - } - - $data = [ - 'accounts' => [], - 'delimiters' => $delimiters, - 'specifics' => $specifics, - ]; - - return $data; - } - - /** - * @param ImportJob $importJob - */ - public function setImportJob(ImportJob $importJob): void - { - $this->importJob = $importJob; - $this->repository = app(ImportJobRepositoryInterface::class); - $this->repository->setUser($importJob->user); - $this->accountRepos = app(AccountRepositoryInterface::class); - $this->accountRepos->setUser($importJob->user); - - } + /** @var ImportJob */ + private $importJob; + /** @var ImportJobRepositoryInterface */ + private $repository; /** * Store data associated with current stage. @@ -137,6 +88,40 @@ class ConfigureUploadHandler implements FileConfigurationInterface return new MessageBag; } + /** + * Get the data necessary to show the configuration screen. + * + * @return array + */ + public function getNextData(): array + { + $delimiters = [ + ',' => trans('form.csv_comma'), + ';' => trans('form.csv_semicolon'), + 'tab' => trans('form.csv_tab'), + ]; + $config = $this->importJob->configuration; + $config['date-format'] = $config['date-format'] ?? 'Ymd'; + $specifics = []; + $this->repository->setConfiguration($this->importJob, $config); + + // collect specifics. + foreach (config('csv.import_specifics') as $name => $className) { + $specifics[$name] = [ + 'name' => trans($className::getName()), + 'description' => trans($className::getDescription()), + ]; + } + + $data = [ + 'accounts' => [], + 'delimiters' => $delimiters, + 'specifics' => $specifics, + ]; + + return $data; + } + /** * @param array $data * @@ -159,4 +144,17 @@ class ConfigureUploadHandler implements FileConfigurationInterface return $return; } + + /** + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository->setUser($importJob->user); + $this->accountRepos = app(AccountRepositoryInterface::class); + $this->accountRepos->setUser($importJob->user); + + } } diff --git a/app/Support/Import/JobConfiguration/File/NewFileJobHandler.php b/app/Support/Import/JobConfiguration/File/NewFileJobHandler.php index 27ba527bc2..40c9ac8888 100644 --- a/app/Support/Import/JobConfiguration/File/NewFileJobHandler.php +++ b/app/Support/Import/JobConfiguration/File/NewFileJobHandler.php @@ -80,6 +80,7 @@ class NewFileJobHandler implements FileConfigurationInterface /** * * Get the data necessary to show the configuration screen. + * * @codeCoverageIgnore * @return array */ diff --git a/app/Support/Import/JobConfiguration/Spectre/ChooseLoginHandler.php b/app/Support/Import/JobConfiguration/Spectre/ChooseLoginHandler.php index 1687a0689d..d4f1a60e73 100644 --- a/app/Support/Import/JobConfiguration/Spectre/ChooseLoginHandler.php +++ b/app/Support/Import/JobConfiguration/Spectre/ChooseLoginHandler.php @@ -26,12 +26,7 @@ namespace FireflyIII\Support\Import\JobConfiguration\Spectre; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\ImportJob; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use FireflyIII\Services\Spectre\Object\Customer; use FireflyIII\Services\Spectre\Object\Login; -use FireflyIII\Services\Spectre\Object\Token; -use FireflyIII\Services\Spectre\Request\CreateTokenRequest; -use FireflyIII\Services\Spectre\Request\ListCustomersRequest; -use FireflyIII\Services\Spectre\Request\NewCustomerRequest; use FireflyIII\Support\Import\Information\GetSpectreCustomerTrait; use FireflyIII\Support\Import\Information\GetSpectreTokenTrait; use Illuminate\Support\MessageBag; diff --git a/app/Support/Import/Placeholder/ColumnValue.php b/app/Support/Import/Placeholder/ColumnValue.php index edefbcc168..b55cd00a67 100644 --- a/app/Support/Import/Placeholder/ColumnValue.php +++ b/app/Support/Import/Placeholder/ColumnValue.php @@ -25,6 +25,7 @@ namespace FireflyIII\Support\Import\Placeholder; /** * Class ColumnValue + * * @codeCoverageIgnore */ class ColumnValue diff --git a/app/Support/Import/Routine/File/CSVProcessor.php b/app/Support/Import/Routine/File/CSVProcessor.php index 0d338f0fb4..e5b295af2a 100644 --- a/app/Support/Import/Routine/File/CSVProcessor.php +++ b/app/Support/Import/Routine/File/CSVProcessor.php @@ -62,7 +62,7 @@ class CSVProcessor implements FileProcessorInterface // validate mapped values: /** @var MappedValuesValidator $validator */ - $validator = app(MappedValuesValidator::class); + $validator = app(MappedValuesValidator::class); $validator->setImportJob($this->importJob); $mappedValues = $validator->validate($mappingConverger->getMappedValues()); diff --git a/app/Support/Import/Routine/File/FileProcessorInterface.php b/app/Support/Import/Routine/File/FileProcessorInterface.php index c361dd9a44..13f6dfffd8 100644 --- a/app/Support/Import/Routine/File/FileProcessorInterface.php +++ b/app/Support/Import/Routine/File/FileProcessorInterface.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace FireflyIII\Support\Import\Routine\File; + use FireflyIII\Models\ImportJob; diff --git a/app/Support/Import/Routine/File/LineReader.php b/app/Support/Import/Routine/File/LineReader.php index 36744c5d38..927847313b 100644 --- a/app/Support/Import/Routine/File/LineReader.php +++ b/app/Support/Import/Routine/File/LineReader.php @@ -164,6 +164,7 @@ class LineReader } catch (\League\Csv\Exception $e) { throw new FireflyException(sprintf('Cannot set delimiter: %s', $e->getMessage())); } + // @codeCoverageIgnoreEnd return $reader; diff --git a/app/Support/Preferences.php b/app/Support/Preferences.php index 38825077c6..cc24ef44f1 100644 --- a/app/Support/Preferences.php +++ b/app/Support/Preferences.php @@ -208,7 +208,7 @@ class Preferences /** * @param \FireflyIII\User $user * @param $name - * @param mixed $value + * @param mixed $value * * @return Preference */ diff --git a/app/Support/Steam.php b/app/Support/Steam.php index e3ab8d1d72..6c6003e6d2 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -55,7 +55,7 @@ class Steam // /** @var AccountRepositoryInterface $repository */ $repository = app(AccountRepositoryInterface::class); - $currencyId = (int)$repository->getMetaValue($account, 'currency_id'); + $currencyId = (int)$repository->getMetaValue($account, 'currency_id'); // use system default currency: if (0 === $currencyId) { @@ -77,9 +77,9 @@ class Steam ->where('transactions.transaction_currency_id', '!=', $currencyId) ->sum('transactions.foreign_amount'); - $balance = bcadd($nativeBalance, $foreignBalance); - $virtual = null === $account->virtual_balance ? '0' : (string)$account->virtual_balance; - $balance = bcadd($balance, $virtual); + $balance = bcadd($nativeBalance, $foreignBalance); + $virtual = null === $account->virtual_balance ? '0' : (string)$account->virtual_balance; + $balance = bcadd($balance, $virtual); $cache->store($balance); return $balance; diff --git a/app/Support/Twig/Extension/Transaction.php b/app/Support/Twig/Extension/Transaction.php index 759880ff88..5294840ac7 100644 --- a/app/Support/Twig/Extension/Transaction.php +++ b/app/Support/Twig/Extension/Transaction.php @@ -26,11 +26,11 @@ use FireflyIII\Models\AccountType; use FireflyIII\Models\Attachment; use FireflyIII\Models\Transaction as TransactionModel; use FireflyIII\Models\TransactionCurrency; +use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionType; use Lang; use Log; use Twig_Extension; -use FireflyIII\Models\TransactionJournal; /** * Class Transaction. diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php index a2945e833d..e744976414 100644 --- a/app/Support/Twig/General.php +++ b/app/Support/Twig/General.php @@ -24,12 +24,12 @@ namespace FireflyIII\Support\Twig; use Carbon\Carbon; use FireflyIII\Models\Account; +use FireflyIII\Support\Twig\Extension\Account as AccountExtension; use League\CommonMark\CommonMarkConverter; use Route; use Twig_Extension; use Twig_SimpleFilter; use Twig_SimpleFunction; -use FireflyIII\Support\Twig\Extension\Account as AccountExtension; /** * Class TwigSupport. diff --git a/app/TransactionRules/Actions/LinkToBill.php b/app/TransactionRules/Actions/LinkToBill.php index 6ffb84cb8e..d0bd43240c 100644 --- a/app/TransactionRules/Actions/LinkToBill.php +++ b/app/TransactionRules/Actions/LinkToBill.php @@ -58,8 +58,8 @@ class LinkToBill implements ActionInterface /** @var BillRepositoryInterface $repository */ $repository = app(BillRepositoryInterface::class); $repository->setUser($this->action->rule->user); - $billName = (string)$this->action->action_value; - $bill = $repository->findByName($billName); + $billName = (string)$this->action->action_value; + $bill = $repository->findByName($billName); if (null !== $bill && $journal->transactionType->type === TransactionType::WITHDRAWAL) { $journal->bill()->associate($bill); diff --git a/app/TransactionRules/Actions/SetDestinationAccount.php b/app/TransactionRules/Actions/SetDestinationAccount.php index 1ad5fb1a46..956ae71670 100644 --- a/app/TransactionRules/Actions/SetDestinationAccount.php +++ b/app/TransactionRules/Actions/SetDestinationAccount.php @@ -101,8 +101,8 @@ class SetDestinationAccount implements ActionInterface // update destination transaction with new destination account: // get destination transaction: - $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - if(null === $transaction) { + $transaction = $journal->transactions()->where('amount', '>', 0)->first(); + if (null === $transaction) { return true; } $transaction->account_id = $this->newDestinationAccount->id; diff --git a/app/User.php b/app/User.php index 3e3150fd13..2ffd076912 100644 --- a/app/User.php +++ b/app/User.php @@ -25,7 +25,23 @@ declare(strict_types=1); namespace FireflyIII; use FireflyIII\Events\RequestedNewPassword; +use FireflyIII\Models\Account; +use FireflyIII\Models\Attachment; +use FireflyIII\Models\AvailableBudget; +use FireflyIII\Models\Bill; +use FireflyIII\Models\Budget; +use FireflyIII\Models\Category; use FireflyIII\Models\CurrencyExchangeRate; +use FireflyIII\Models\ExportJob; +use FireflyIII\Models\ImportJob; +use FireflyIII\Models\PiggyBank; +use FireflyIII\Models\Preference; +use FireflyIII\Models\Role; +use FireflyIII\Models\Rule; +use FireflyIII\Models\RuleGroup; +use FireflyIII\Models\Tag; +use FireflyIII\Models\Transaction; +use FireflyIII\Models\TransactionJournal; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasManyThrough; @@ -36,26 +52,11 @@ use Laravel\Passport\HasApiTokens; use Log; use Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\Transaction; -use FireflyIII\Models\Tag; -use FireflyIII\Models\Rule; -use FireflyIII\Models\RuleGroup; -use FireflyIII\Models\Role; -use FireflyIII\Models\Preference; -use FireflyIII\Models\Account; -use FireflyIII\Models\PiggyBank; -use FireflyIII\Models\ImportJob; -use FireflyIII\Models\ExportJob; -use FireflyIII\Models\Category; -use FireflyIII\Models\Budget; -use FireflyIII\Models\Bill; -use FireflyIII\Models\AvailableBudget; -use FireflyIII\Models\Attachment; /** * Class User. - * @property int $id + * + * @property int $id * @property string $email */ class User extends Authenticatable