From aad0864018f67f490a15d72382685648a6366266 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 10 Mar 2018 22:38:20 +0100 Subject: [PATCH] Various code cleanup [skip ci] --- app/Api/V1/Controllers/AccountController.php | 8 +-- app/Api/V1/Controllers/BillController.php | 1 - app/Api/V1/Controllers/Controller.php | 3 +- .../V1/Controllers/TransactionController.php | 1 - app/Api/V1/Requests/Request.php | 1 + app/Exceptions/FireflyException.php | 1 + .../Events/StoredJournalEventHandler.php | 1 - app/Helpers/Chart/MetaPieChart.php | 1 + .../Collector/JournalCollectorInterface.php | 14 ++--- app/Http/Controllers/DebugController.php | 2 +- app/Http/Controllers/ProfileController.php | 61 ++++++++++--------- app/Http/Controllers/RuleGroupController.php | 3 +- .../Transaction/BulkController.php | 2 +- app/Http/Kernel.php | 2 +- app/Http/Middleware/Installer.php | 14 +++-- app/Http/Middleware/Sandstorm.php | 4 +- app/Http/Middleware/TrustProxies.php | 2 +- app/Import/Configuration/BunqConfigurator.php | 1 + app/Models/Account.php | 1 - app/Models/ImportJob.php | 1 + app/Models/PiggyBank.php | 2 + app/Models/PiggyBankEvent.php | 1 + app/Models/Preference.php | 1 + app/Models/Transaction.php | 2 +- app/Providers/EventServiceProvider.php | 5 -- app/Providers/FireflyServiceProvider.php | 1 - .../Account/AccountRepository.php | 2 +- .../Account/AccountRepositoryInterface.php | 2 +- .../Budget/BudgetRepositoryInterface.php | 19 +++--- .../Category/CategoryRepositoryInterface.php | 19 +++--- app/Rules/BelongsUser.php | 2 +- app/Rules/ValidTransactions.php | 3 +- .../Bunq/Request/DeviceServerRequest.php | 4 +- .../Bunq/Request/DeviceSessionRequest.php | 1 - .../Destroy/AccountDestroyService.php | 2 +- .../Internal/Destroy/BillDestroyService.php | 3 +- .../Destroy/JournalDestroyService.php | 2 +- .../Internal/Support/AccountServiceTrait.php | 2 +- .../Internal/Support/BillServiceTrait.php | 1 + .../Support/TransactionServiceTrait.php | 3 + .../Internal/Update/AccountUpdateService.php | 7 --- app/Support/Binder/CurrencyCode.php | 2 +- app/Support/Binder/Date.php | 2 +- app/Support/Binder/JournalList.php | 2 +- app/Support/Binder/TagList.php | 2 +- app/Support/Binder/UnfinishedJournal.php | 2 +- app/Support/Twig/Extension/Transaction.php | 1 + app/Support/Twig/General.php | 2 - app/TransactionRules/Actions/ClearBudget.php | 2 +- .../Actions/ClearCategory.php | 2 +- app/Transformers/AccountTransformer.php | 1 - app/Transformers/BillTransformer.php | 1 - app/Transformers/BudgetTransformer.php | 1 - app/Transformers/CategoryTransformer.php | 1 - app/Transformers/JournalMetaTransformer.php | 1 - .../PiggyBankEventTransformer.php | 1 - app/Transformers/TagTransformer.php | 1 - app/Transformers/TransactionTransformer.php | 4 +- app/Validation/FireflyValidator.php | 2 +- 59 files changed, 118 insertions(+), 120 deletions(-) diff --git a/app/Api/V1/Controllers/AccountController.php b/app/Api/V1/Controllers/AccountController.php index b30fe6903a..7a419942f4 100644 --- a/app/Api/V1/Controllers/AccountController.php +++ b/app/Api/V1/Controllers/AccountController.php @@ -95,16 +95,16 @@ class AccountController extends Controller public function index(Request $request) { // create some objects: - $manager = new Manager(); - $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1'; + $manager = new Manager(); + $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1'; // read type from URI $type = $request->get('type') ?? 'all'; $this->parameters->set('type', $type); // types to get, page size: - $types = $this->mapTypes($this->parameters->get('type')); - $pageSize = intval(Preferences::getForUser(auth()->user(), 'listPageSize', 50)->data); + $types = $this->mapTypes($this->parameters->get('type')); + $pageSize = intval(Preferences::getForUser(auth()->user(), 'listPageSize', 50)->data); // get list of accounts. Count it and split it. $collection = $this->repository->getAccountsByType($types); diff --git a/app/Api/V1/Controllers/BillController.php b/app/Api/V1/Controllers/BillController.php index 6e62d6e906..e49b8f6584 100644 --- a/app/Api/V1/Controllers/BillController.php +++ b/app/Api/V1/Controllers/BillController.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers; use FireflyIII\Api\V1\Requests\BillRequest; -use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Bill; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Transformers\BillTransformer; diff --git a/app/Api/V1/Controllers/Controller.php b/app/Api/V1/Controllers/Controller.php index 91145d63b8..1c944b8f75 100644 --- a/app/Api/V1/Controllers/Controller.php +++ b/app/Api/V1/Controllers/Controller.php @@ -34,6 +34,7 @@ use Symfony\Component\HttpFoundation\ParameterBag; /** * Class Controller. + * * @codeCoverageIgnore */ class Controller extends BaseController @@ -70,7 +71,7 @@ class Controller extends BaseController $return = '?'; $params = []; foreach ($this->parameters as $key => $value) { - if($key === 'page') { + if ($key === 'page') { continue; } if ($value instanceof Carbon) { diff --git a/app/Api/V1/Controllers/TransactionController.php b/app/Api/V1/Controllers/TransactionController.php index b02e69e2d3..9d2794e311 100644 --- a/app/Api/V1/Controllers/TransactionController.php +++ b/app/Api/V1/Controllers/TransactionController.php @@ -37,7 +37,6 @@ use Illuminate\Support\Collection; use League\Fractal\Manager; use League\Fractal\Pagination\IlluminatePaginatorAdapter; use League\Fractal\Resource\Collection as FractalCollection; -use League\Fractal\Resource\Item; use League\Fractal\Serializer\JsonApiSerializer; use Log; use Preferences; diff --git a/app/Api/V1/Requests/Request.php b/app/Api/V1/Requests/Request.php index 198680635b..2c2362314d 100644 --- a/app/Api/V1/Requests/Request.php +++ b/app/Api/V1/Requests/Request.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; use FireflyIII\Http\Requests\Request as FireflyIIIRequest; + /** * Class Request. */ diff --git a/app/Exceptions/FireflyException.php b/app/Exceptions/FireflyException.php index b2c9916292..ba10b6168e 100644 --- a/app/Exceptions/FireflyException.php +++ b/app/Exceptions/FireflyException.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Exceptions; use Exception; + /** * Class FireflyException. */ diff --git a/app/Handlers/Events/StoredJournalEventHandler.php b/app/Handlers/Events/StoredJournalEventHandler.php index ef6a26bcc0..65f73c5573 100644 --- a/app/Handlers/Events/StoredJournalEventHandler.php +++ b/app/Handlers/Events/StoredJournalEventHandler.php @@ -30,7 +30,6 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface as PRI; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface as RGRI; use FireflyIII\Support\Events\BillScanner; use FireflyIII\TransactionRules\Processor; -use Log; /** * @codeCoverageIgnore diff --git a/app/Helpers/Chart/MetaPieChart.php b/app/Helpers/Chart/MetaPieChart.php index 931b996360..556b3422ce 100644 --- a/app/Helpers/Chart/MetaPieChart.php +++ b/app/Helpers/Chart/MetaPieChart.php @@ -282,6 +282,7 @@ class MetaPieChart implements MetaPieChartInterface $collector->withCategoryInformation(); $collector->withBudgetInformation(); } + // @codeCoverageIgnoreEnd return $collector->getJournals(); diff --git a/app/Helpers/Collector/JournalCollectorInterface.php b/app/Helpers/Collector/JournalCollectorInterface.php index eef1662e03..1b439a748b 100644 --- a/app/Helpers/Collector/JournalCollectorInterface.php +++ b/app/Helpers/Collector/JournalCollectorInterface.php @@ -42,13 +42,6 @@ interface JournalCollectorInterface */ public function addFilter(string $filter): JournalCollectorInterface; - /** - * @param Collection $journals - * - * @return JournalCollectorInterface - */ - public function setJournals(Collection $journals): JournalCollectorInterface; - /** * @param string $amount * @@ -153,6 +146,13 @@ interface JournalCollectorInterface */ public function setCategory(Category $category): JournalCollectorInterface; + /** + * @param Collection $journals + * + * @return JournalCollectorInterface + */ + public function setJournals(Collection $journals): JournalCollectorInterface; + /** * @param int $limit * diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php index 67dc1ab321..c1271ddfa9 100644 --- a/app/Http/Controllers/DebugController.php +++ b/app/Http/Controllers/DebugController.php @@ -109,7 +109,7 @@ class DebugController extends Controller 'debug', compact( 'phpVersion', - 'extensions','localeAttempts', + 'extensions', 'localeAttempts', 'carbon', 'appEnv', 'appDebug', diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index b3aca1d3e7..1b8d474ce6 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -94,21 +94,9 @@ class ProfileController extends Controller return view('profile.change-password', compact('title', 'subTitle', 'subTitleIcon')); } - /** - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - */ - public function deleteCode() - { - Preferences::delete('twoFactorAuthEnabled'); - Preferences::delete('twoFactorAuthSecret'); - Session::flash('success', strval(trans('firefly.pref_two_factor_auth_disabled'))); - Session::flash('info', strval(trans('firefly.pref_two_factor_auth_remove_it'))); - - return redirect(route('profile.index')); - } - /** * View that generates a 2FA code for the user. + * * @return View */ public function code() @@ -121,23 +109,6 @@ class ProfileController extends Controller return view('profile.code', compact('image')); } - /** - * @param TokenFormRequest $request - * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - * @SuppressWarnings(PHPMD.UnusedFormalParameter) // it's unused but the class does some validation. - */ - public function postCode(TokenFormRequest $request) - { - Preferences::set('twoFactorAuthEnabled', 1); - Preferences::set('twoFactorAuthSecret', Session::get('two-factor-secret')); - - Session::flash('success', strval(trans('firefly.saved_preferences'))); - Preferences::mark(); - - return redirect(route('profile.index')); - } - /** * @param UserRepositoryInterface $repository * @param string $token @@ -185,6 +156,19 @@ class ProfileController extends Controller return view('profile.delete-account', compact('title', 'subTitle', 'subTitleIcon')); } + /** + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + */ + public function deleteCode() + { + Preferences::delete('twoFactorAuthEnabled'); + Preferences::delete('twoFactorAuthSecret'); + Session::flash('success', strval(trans('firefly.pref_two_factor_auth_disabled'))); + Session::flash('info', strval(trans('firefly.pref_two_factor_auth_remove_it'))); + + return redirect(route('profile.index')); + } + /** * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ @@ -296,6 +280,23 @@ class ProfileController extends Controller return redirect(route('profile.index')); } + /** + * @param TokenFormRequest $request + * + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @SuppressWarnings(PHPMD.UnusedFormalParameter) // it's unused but the class does some validation. + */ + public function postCode(TokenFormRequest $request) + { + Preferences::set('twoFactorAuthEnabled', 1); + Preferences::set('twoFactorAuthSecret', Session::get('two-factor-secret')); + + Session::flash('success', strval(trans('firefly.saved_preferences'))); + Preferences::mark(); + + return redirect(route('profile.index')); + } + /** * @param UserRepositoryInterface $repository * @param DeleteAccountFormRequest $request diff --git a/app/Http/Controllers/RuleGroupController.php b/app/Http/Controllers/RuleGroupController.php index 98308933f7..630c8378b5 100644 --- a/app/Http/Controllers/RuleGroupController.php +++ b/app/Http/Controllers/RuleGroupController.php @@ -188,7 +188,8 @@ class RuleGroupController extends Controller public function selectTransactions(AccountRepositoryInterface $repository, RuleGroup $ruleGroup) { // does the user have shared accounts? - $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); + $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); + // todo could be removed? $accountList = ExpandedForm::makeSelectList($accounts); $checkedAccounts = array_keys($accountList); $first = session('first')->format('Y-m-d'); diff --git a/app/Http/Controllers/Transaction/BulkController.php b/app/Http/Controllers/Transaction/BulkController.php index 45fdc9c78e..6f0805961d 100644 --- a/app/Http/Controllers/Transaction/BulkController.php +++ b/app/Http/Controllers/Transaction/BulkController.php @@ -168,7 +168,7 @@ class BulkController extends Controller } if ($ignoreTags === false) { Log::debug(sprintf('Set tags to %s', $request->string('budget_id'))); - $repository->updateTags($journal,['tags' => explode(',', $request->string('tags'))]); + $repository->updateTags($journal, ['tags' => explode(',', $request->string('tags'))]); } // update tags if not told to ignore (and is withdrawal) } diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 19a823a5ae..6b6b17dd59 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -67,7 +67,7 @@ class Kernel extends HttpKernel TrimStrings::class, ConvertEmptyStringsToNull::class, TrustProxies::class, - Installer::class + Installer::class, ]; /** diff --git a/app/Http/Middleware/Installer.php b/app/Http/Middleware/Installer.php index d707f6872a..7fd066f7eb 100644 --- a/app/Http/Middleware/Installer.php +++ b/app/Http/Middleware/Installer.php @@ -26,13 +26,14 @@ class Installer */ public function handle($request, Closure $next) { - if(env('APP_ENV') === 'testing') { + if (env('APP_ENV') === 'testing') { return $next($request); } - $url = $request->url(); + $url = $request->url(); $strpos = stripos($url, '/install'); if (!($strpos === false)) { Log::debug(sprintf('URL is %s, will NOT run installer middleware', $url)); + return $next($request); } Log::debug(sprintf('URL is %s, will run installer middleware', $url)); @@ -59,13 +60,16 @@ class Installer $configVersion = intval(config('firefly.db_version')); $dbVersion = intval(FireflyConfig::getFresh('db_version', 1)->data); if ($configVersion > $dbVersion) { - Log::warning(sprintf( - 'The current installed version (%d) is older than the required version (%d). Redirect to migrate routine.', $dbVersion, $configVersion - )); + Log::warning( + sprintf( + 'The current installed version (%d) is older than the required version (%d). Redirect to migrate routine.', $dbVersion, $configVersion + ) + ); // redirect to migrate routine: return response()->redirectTo(route('installer.index')); } + return $next($request); } diff --git a/app/Http/Middleware/Sandstorm.php b/app/Http/Middleware/Sandstorm.php index 5dce1f605a..c8b6e3e878 100644 --- a/app/Http/Middleware/Sandstorm.php +++ b/app/Http/Middleware/Sandstorm.php @@ -95,9 +95,9 @@ class Sandstorm /** @var User $user */ $user = $repository->store( [ - 'blocked' => false, + 'blocked' => false, 'blocked_code' => null, - 'email' => $email, + 'email' => $email, ] ); Auth::guard($guard)->login($user); diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index e253db024f..63cbdbd2f3 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -32,7 +32,7 @@ use Illuminate\Http\Request; */ class TrustProxies extends Middleware { - /** @var int */ + /** @var int */ protected $headers = Request::HEADER_X_FORWARDED_ALL; /** diff --git a/app/Import/Configuration/BunqConfigurator.php b/app/Import/Configuration/BunqConfigurator.php index 930690d1cc..ceca16f03e 100644 --- a/app/Import/Configuration/BunqConfigurator.php +++ b/app/Import/Configuration/BunqConfigurator.php @@ -186,6 +186,7 @@ class BunqConfigurator implements ConfiguratorInterface return false; case 'initial': Log::debug('isJobConfigured returns true'); + return true; break; default: diff --git a/app/Models/Account.php b/app/Models/Account.php index b70870c148..6771ef16fc 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -22,7 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Carbon\Carbon; use Crypt; use FireflyIII\Exceptions\FireflyException; use Illuminate\Contracts\Encryption\DecryptException; diff --git a/app/Models/ImportJob.php b/app/Models/ImportJob.php index d05e49fe41..779d759d85 100644 --- a/app/Models/ImportJob.php +++ b/app/Models/ImportJob.php @@ -32,6 +32,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** * Class ImportJob. + * * @property User $user */ class ImportJob extends Model diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 8706a4b302..b0195287cf 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -90,6 +90,7 @@ class PiggyBank extends Model /** * Grabs the PiggyBankRepetition that's currently relevant / active. + * * @deprecated * @returns PiggyBankRepetition */ @@ -153,6 +154,7 @@ class PiggyBank extends Model /** * @param Carbon $date + * * @deprecated * @return string */ diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index d937815739..2497b050f8 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -26,6 +26,7 @@ use Illuminate\Database\Eloquent\Model; /** * Class PiggyBankEvent. + * * @property $piggyBank */ class PiggyBankEvent extends Model diff --git a/app/Models/Preference.php b/app/Models/Preference.php index 07fc7d2fda..22db5a66dd 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -31,6 +31,7 @@ use Log; /** * Class Preference. + * * @property mixed $data */ class Preference extends Model diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 09ab60ab42..f965a5c8e9 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -91,7 +91,7 @@ class Transaction extends Model */ protected $fillable = ['account_id', 'transaction_journal_id', 'description', 'amount', 'identifier', 'transaction_currency_id', 'foreign_currency_id', - 'foreign_amount','reconciled']; + 'foreign_amount', 'reconciled']; /** * @var array */ diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 65d703e6f4..6970b7b4b1 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -24,15 +24,10 @@ namespace FireflyIII\Providers; use FireflyIII\Events\RegisteredUser; use FireflyIII\Events\RequestedVersionCheckStatus; -use FireflyIII\Models\Account; use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBankRepetition; -use FireflyIII\Models\Transaction; -use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionJournalMeta; use Illuminate\Auth\Events\Login; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; -use Log; /** * Class EventServiceProvider. diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php index 2b56a7f1fd..a058b10eb9 100644 --- a/app/Providers/FireflyServiceProvider.php +++ b/app/Providers/FireflyServiceProvider.php @@ -46,7 +46,6 @@ use FireflyIII\Repositories\TransactionType\TransactionTypeRepository; use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface; use FireflyIII\Repositories\User\UserRepository; use FireflyIII\Repositories\User\UserRepositoryInterface; -use FireflyIII\Services\Password\PwndVerifier; use FireflyIII\Services\Password\PwndVerifierV2; use FireflyIII\Services\Password\Verifier; use FireflyIII\Support\Amount; diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index 6c6d5348ff..16592f0c40 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -60,7 +60,7 @@ class AccountRepository implements AccountRepositoryInterface /** * Moved here from account CRUD. * - * @param Account $account + * @param Account $account * @param Account|null $moveTo * * @return bool diff --git a/app/Repositories/Account/AccountRepositoryInterface.php b/app/Repositories/Account/AccountRepositoryInterface.php index 70b74070b5..486f61dae8 100644 --- a/app/Repositories/Account/AccountRepositoryInterface.php +++ b/app/Repositories/Account/AccountRepositoryInterface.php @@ -47,7 +47,7 @@ interface AccountRepositoryInterface /** * Moved here from account CRUD. * - * @param Account $account + * @param Account $account * @param Account|null $moveTo * * @return bool diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index 1a6ca75625..8c42d61e51 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -73,21 +73,13 @@ interface BudgetRepositoryInterface * Find a budget. * * @param int $budgetId + * * @deprecated * * @return Budget */ public function find(int $budgetId): Budget; - /** - * Find a budget or return NULL - * - * @param int $budgetId - * - * @return Budget|null - */ - public function findNull(int $budgetId): ?Budget; - /** * Find a budget. * @@ -97,6 +89,15 @@ interface BudgetRepositoryInterface */ public function findByName(string $name): ?Budget; + /** + * Find a budget or return NULL + * + * @param int $budgetId + * + * @return Budget|null + */ + public function findNull(int $budgetId): ?Budget; + /** * This method returns the oldest journal or transaction date known to this budget. * Will cache result. diff --git a/app/Repositories/Category/CategoryRepositoryInterface.php b/app/Repositories/Category/CategoryRepositoryInterface.php index 84e3f1d922..e224ef84e7 100644 --- a/app/Repositories/Category/CategoryRepositoryInterface.php +++ b/app/Repositories/Category/CategoryRepositoryInterface.php @@ -53,20 +53,12 @@ interface CategoryRepositoryInterface * Find a category. * * @param int $categoryId + * * @deprecated * @return Category */ public function find(int $categoryId): Category; - /** - * Find a category or return NULL - * - * @param int $categoryId - * - * @return Category|null - */ - public function findNull(int $categoryId): ?Category; - /** * Find a category. * @@ -76,6 +68,15 @@ interface CategoryRepositoryInterface */ public function findByName(string $name): ?Category; + /** + * Find a category or return NULL + * + * @param int $categoryId + * + * @return Category|null + */ + public function findNull(int $categoryId): ?Category; + /** * @param Category $category * diff --git a/app/Rules/BelongsUser.php b/app/Rules/BelongsUser.php index 5b0b26ce7f..6e695dcd02 100644 --- a/app/Rules/BelongsUser.php +++ b/app/Rules/BelongsUser.php @@ -2,7 +2,6 @@ declare(strict_types=1); - /** * BelongsUser.php * Copyright (c) 2018 thegrumpydictator@gmail.com @@ -61,6 +60,7 @@ class BelongsUser implements Rule /** * Determine if the validation rule passes. * TODO use repositories? + * * @param string $attribute * @param mixed $value * diff --git a/app/Rules/ValidTransactions.php b/app/Rules/ValidTransactions.php index 1ffb21b0cd..471e328d89 100644 --- a/app/Rules/ValidTransactions.php +++ b/app/Rules/ValidTransactions.php @@ -2,7 +2,6 @@ declare(strict_types=1); - /** * ValidTransactions.php * Copyright (c) 2018 thegrumpydictator@gmail.com @@ -75,10 +74,12 @@ class ValidTransactions implements Rule ->where('accounts.user_id', $userId)->count(); if ($count === 0) { Log::debug(sprintf('Count for transaction #%d and user #%d is zero! Return FALSE', $transactionId, $userId)); + return false; } } Log::debug('Return true!'); + return true; } } diff --git a/app/Services/Bunq/Request/DeviceServerRequest.php b/app/Services/Bunq/Request/DeviceServerRequest.php index 08cbb3219f..d343dd0211 100644 --- a/app/Services/Bunq/Request/DeviceServerRequest.php +++ b/app/Services/Bunq/Request/DeviceServerRequest.php @@ -56,8 +56,8 @@ class DeviceServerRequest extends BunqRequest Log::debug('Headers we send along: ', $headers); - $response = $this->sendSignedBunqPost($uri, $data, $headers); - $deviceServerId = new DeviceServerId; + $response = $this->sendSignedBunqPost($uri, $data, $headers); + $deviceServerId = new DeviceServerId; $deviceServerId->setId(intval($response['Response'][0]['Id']['id'])); $this->deviceServerId = $deviceServerId; diff --git a/app/Services/Bunq/Request/DeviceSessionRequest.php b/app/Services/Bunq/Request/DeviceSessionRequest.php index 4828787895..d67c14c8d1 100644 --- a/app/Services/Bunq/Request/DeviceSessionRequest.php +++ b/app/Services/Bunq/Request/DeviceSessionRequest.php @@ -28,7 +28,6 @@ use FireflyIII\Services\Bunq\Object\UserCompany; use FireflyIII\Services\Bunq\Object\UserPerson; use FireflyIII\Services\Bunq\Token\InstallationToken; use FireflyIII\Services\Bunq\Token\SessionToken; -use Log; /** * Class DeviceSessionRequest. diff --git a/app/Services/Internal/Destroy/AccountDestroyService.php b/app/Services/Internal/Destroy/AccountDestroyService.php index 3b476c4092..222363b4aa 100644 --- a/app/Services/Internal/Destroy/AccountDestroyService.php +++ b/app/Services/Internal/Destroy/AccountDestroyService.php @@ -63,7 +63,7 @@ class AccountDestroyService try { $account->delete(); } catch (Exception $e) { // @codeCoverageIgnore - Log::error(sprintf('Could not delete account: %s',$e->getMessage())); // @codeCoverageIgnore + Log::error(sprintf('Could not delete account: %s', $e->getMessage())); // @codeCoverageIgnore } return true; diff --git a/app/Services/Internal/Destroy/BillDestroyService.php b/app/Services/Internal/Destroy/BillDestroyService.php index d7f6c8f42e..061d7d21cd 100644 --- a/app/Services/Internal/Destroy/BillDestroyService.php +++ b/app/Services/Internal/Destroy/BillDestroyService.php @@ -26,6 +26,7 @@ namespace FireflyIII\Services\Internal\Destroy; use Exception; use FireflyIII\Models\Bill; use Log; + /** * @codeCoverageIgnore * Class BillDestroyService @@ -40,7 +41,7 @@ class BillDestroyService try { $bill->delete(); } catch (Exception $e) { // @codeCoverageIgnore - Log::error(sprintf('Could not delete bill: %s',$e->getMessage())); // @codeCoverageIgnore + Log::error(sprintf('Could not delete bill: %s', $e->getMessage())); // @codeCoverageIgnore } } diff --git a/app/Services/Internal/Destroy/JournalDestroyService.php b/app/Services/Internal/Destroy/JournalDestroyService.php index 6ebd9a8aa6..a85c988514 100644 --- a/app/Services/Internal/Destroy/JournalDestroyService.php +++ b/app/Services/Internal/Destroy/JournalDestroyService.php @@ -56,7 +56,7 @@ class JournalDestroyService } $journal->delete(); } catch (Exception $e) { - Log::error(sprintf('Could not delete bill: %s',$e->getMessage())); // @codeCoverageIgnore + Log::error(sprintf('Could not delete bill: %s', $e->getMessage())); // @codeCoverageIgnore } return; diff --git a/app/Services/Internal/Support/AccountServiceTrait.php b/app/Services/Internal/Support/AccountServiceTrait.php index 6d32b6978a..bad188a803 100644 --- a/app/Services/Internal/Support/AccountServiceTrait.php +++ b/app/Services/Internal/Support/AccountServiceTrait.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Services\Internal\Support; -use Exception; use FireflyIII\Factory\AccountFactory; use FireflyIII\Factory\AccountMetaFactory; use FireflyIII\Factory\TransactionFactory; @@ -255,6 +254,7 @@ trait AccountServiceTrait return true; } + return true; // @codeCoverageIgnore } diff --git a/app/Services/Internal/Support/BillServiceTrait.php b/app/Services/Internal/Support/BillServiceTrait.php index 83b17ec90e..e6ec02c8d0 100644 --- a/app/Services/Internal/Support/BillServiceTrait.php +++ b/app/Services/Internal/Support/BillServiceTrait.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace FireflyIII\Services\Internal\Support; + use FireflyIII\Models\Bill; use FireflyIII\Models\Note; diff --git a/app/Services/Internal/Support/TransactionServiceTrait.php b/app/Services/Internal/Support/TransactionServiceTrait.php index 975e3a9612..ce1ec06e65 100644 --- a/app/Services/Internal/Support/TransactionServiceTrait.php +++ b/app/Services/Internal/Support/TransactionServiceTrait.php @@ -217,6 +217,7 @@ trait TransactionServiceTrait { if (is_null($budget)) { $transaction->budgets()->sync([]); + return; } $transaction->budgets()->sync([$budget->id]); @@ -233,6 +234,7 @@ trait TransactionServiceTrait { if (is_null($category)) { $transaction->categories()->sync([]); + return; } $transaction->categories()->sync([$category->id]); @@ -260,6 +262,7 @@ trait TransactionServiceTrait if (is_null($currency)) { $transaction->foreign_currency_id = null; $transaction->save(); + return; } $transaction->foreign_currency_id = $currency->id; diff --git a/app/Services/Internal/Update/AccountUpdateService.php b/app/Services/Internal/Update/AccountUpdateService.php index 1c179ed997..48e46dd7ba 100644 --- a/app/Services/Internal/Update/AccountUpdateService.php +++ b/app/Services/Internal/Update/AccountUpdateService.php @@ -23,14 +23,8 @@ declare(strict_types=1); namespace FireflyIII\Services\Internal\Update; -use Exception; -use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Factory\AccountMetaFactory; use FireflyIII\Models\Account; -use FireflyIII\Models\AccountMeta; -use FireflyIII\Models\AccountType; use FireflyIII\Services\Internal\Support\AccountServiceTrait; -use Log; /** * Class AccountUpdateService @@ -40,7 +34,6 @@ class AccountUpdateService use AccountServiceTrait; - /** * Update account data. * diff --git a/app/Support/Binder/CurrencyCode.php b/app/Support/Binder/CurrencyCode.php index 988a296aac..e142ee83a6 100644 --- a/app/Support/Binder/CurrencyCode.php +++ b/app/Support/Binder/CurrencyCode.php @@ -37,7 +37,7 @@ class CurrencyCode implements BinderInterface * * @return TransactionCurrency */ - public static function routeBinder(string $value, Route $route): TransactionCurrency + public static function routeBinder(string $value, Route $route): TransactionCurrency { if (auth()->check()) { $currency = TransactionCurrency::where('code', trim($value))->first(); diff --git a/app/Support/Binder/Date.php b/app/Support/Binder/Date.php index 9d9cedfe03..5b04cfbd54 100644 --- a/app/Support/Binder/Date.php +++ b/app/Support/Binder/Date.php @@ -40,7 +40,7 @@ class Date implements BinderInterface * * @return Carbon */ - public static function routeBinder(string $value, Route $route): Carbon + public static function routeBinder(string $value, Route $route): Carbon { /** @var FiscalHelperInterface $fiscalHelper */ $fiscalHelper = app(FiscalHelperInterface::class); diff --git a/app/Support/Binder/JournalList.php b/app/Support/Binder/JournalList.php index a0f89dfe79..ee556f9907 100644 --- a/app/Support/Binder/JournalList.php +++ b/app/Support/Binder/JournalList.php @@ -37,7 +37,7 @@ class JournalList implements BinderInterface * * @return mixed */ - public static function routeBinder(string $value, Route $route): Collection + public static function routeBinder(string $value, Route $route): Collection { if (auth()->check()) { $list = []; diff --git a/app/Support/Binder/TagList.php b/app/Support/Binder/TagList.php index 60eb79420e..880a535c11 100644 --- a/app/Support/Binder/TagList.php +++ b/app/Support/Binder/TagList.php @@ -40,7 +40,7 @@ class TagList implements BinderInterface * * @return Collection */ - public static function routeBinder(string $value, Route $route): Collection + public static function routeBinder(string $value, Route $route): Collection { if (auth()->check()) { $list = []; diff --git a/app/Support/Binder/UnfinishedJournal.php b/app/Support/Binder/UnfinishedJournal.php index abcc002eb7..92d03ac75f 100644 --- a/app/Support/Binder/UnfinishedJournal.php +++ b/app/Support/Binder/UnfinishedJournal.php @@ -37,7 +37,7 @@ class UnfinishedJournal implements BinderInterface * * @return TransactionJournal */ - public static function routeBinder(string $value, Route $route): TransactionJournal + public static function routeBinder(string $value, Route $route): TransactionJournal { if (auth()->check()) { $journal = auth()->user()->transactionJournals()->where('transaction_journals.id', $value) diff --git a/app/Support/Twig/Extension/Transaction.php b/app/Support/Twig/Extension/Transaction.php index b77117531b..2d8bb0d66b 100644 --- a/app/Support/Twig/Extension/Transaction.php +++ b/app/Support/Twig/Extension/Transaction.php @@ -225,6 +225,7 @@ class Transaction extends Twig_Extension /** * TODO improve code + * * @param TransactionModel $transaction * * @return string diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php index 07a5ffe8e1..6f22a9c7f5 100644 --- a/app/Support/Twig/General.php +++ b/app/Support/Twig/General.php @@ -24,10 +24,8 @@ namespace FireflyIII\Support\Twig; use Carbon\Carbon; use FireflyIII\Models\Account; -use FireflyIII\Models\TransactionJournal; use League\CommonMark\CommonMarkConverter; use Route; -use Steam; use Twig_Extension; use Twig_SimpleFilter; use Twig_SimpleFunction; diff --git a/app/TransactionRules/Actions/ClearBudget.php b/app/TransactionRules/Actions/ClearBudget.php index 61a282eae3..e2366b7397 100644 --- a/app/TransactionRules/Actions/ClearBudget.php +++ b/app/TransactionRules/Actions/ClearBudget.php @@ -59,7 +59,7 @@ class ClearBudget implements ActionInterface // also remove categories from transactions: /** @var Transaction $transaction */ - foreach($journal->transactions as $transaction) { + foreach ($journal->transactions as $transaction) { $transaction->budgets()->detach(); } diff --git a/app/TransactionRules/Actions/ClearCategory.php b/app/TransactionRules/Actions/ClearCategory.php index 90ec0bb066..df9637c448 100644 --- a/app/TransactionRules/Actions/ClearCategory.php +++ b/app/TransactionRules/Actions/ClearCategory.php @@ -59,7 +59,7 @@ class ClearCategory implements ActionInterface // also remove categories from transactions: /** @var Transaction $transaction */ - foreach($journal->transactions as $transaction) { + foreach ($journal->transactions as $transaction) { $transaction->categories()->detach(); } diff --git a/app/Transformers/AccountTransformer.php b/app/Transformers/AccountTransformer.php index dae5b8f5fb..cd3f339433 100644 --- a/app/Transformers/AccountTransformer.php +++ b/app/Transformers/AccountTransformer.php @@ -25,7 +25,6 @@ namespace FireflyIII\Transformers; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollector; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; diff --git a/app/Transformers/BillTransformer.php b/app/Transformers/BillTransformer.php index bffa784cd7..45b9a89182 100644 --- a/app/Transformers/BillTransformer.php +++ b/app/Transformers/BillTransformer.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollector; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\Bill; use FireflyIII\Models\Note; diff --git a/app/Transformers/BudgetTransformer.php b/app/Transformers/BudgetTransformer.php index 4163973ecc..7fc3d82db7 100644 --- a/app/Transformers/BudgetTransformer.php +++ b/app/Transformers/BudgetTransformer.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; -use FireflyIII\Helpers\Collector\JournalCollector; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\Budget; use Illuminate\Support\Collection; diff --git a/app/Transformers/CategoryTransformer.php b/app/Transformers/CategoryTransformer.php index 1d7c3bde8b..8c7ea8d6dc 100644 --- a/app/Transformers/CategoryTransformer.php +++ b/app/Transformers/CategoryTransformer.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; -use FireflyIII\Helpers\Collector\JournalCollector; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\Category; use Illuminate\Support\Collection; diff --git a/app/Transformers/JournalMetaTransformer.php b/app/Transformers/JournalMetaTransformer.php index 3985b4ab2a..09de3a397a 100644 --- a/app/Transformers/JournalMetaTransformer.php +++ b/app/Transformers/JournalMetaTransformer.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; -use FireflyIII\Helpers\Collector\JournalCollector; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\TransactionJournalMeta; use Illuminate\Support\Collection; diff --git a/app/Transformers/PiggyBankEventTransformer.php b/app/Transformers/PiggyBankEventTransformer.php index 4f20f73885..2fad262ebd 100644 --- a/app/Transformers/PiggyBankEventTransformer.php +++ b/app/Transformers/PiggyBankEventTransformer.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; -use FireflyIII\Helpers\Collector\JournalCollector; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\PiggyBankEvent; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; diff --git a/app/Transformers/TagTransformer.php b/app/Transformers/TagTransformer.php index 6cc8cff5ef..d57b6f2599 100644 --- a/app/Transformers/TagTransformer.php +++ b/app/Transformers/TagTransformer.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Transformers; -use FireflyIII\Helpers\Collector\JournalCollector; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\Tag; use League\Fractal\Resource\Collection as FractalCollection; diff --git a/app/Transformers/TransactionTransformer.php b/app/Transformers/TransactionTransformer.php index e4f99fbcd2..351e2c39ca 100644 --- a/app/Transformers/TransactionTransformer.php +++ b/app/Transformers/TransactionTransformer.php @@ -170,8 +170,8 @@ class TransactionTransformer extends TransformerAbstract } /** @var Note $dbNote */ $dbNote = $transaction->transactionJournal->notes()->first(); - $notes = null; - if(!is_null($dbNote)) { + $notes = null; + if (!is_null($dbNote)) { $notes = $dbNote->text; } diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php index ff07c8321b..c004d77fde 100644 --- a/app/Validation/FireflyValidator.php +++ b/app/Validation/FireflyValidator.php @@ -396,7 +396,7 @@ class FireflyValidator extends Validator public function validateUniqueAccountNumberForUser($attribute, $value, $parameters): bool { $accountId = $this->data['id'] ?? 0; - if($accountId === 0) { + if ($accountId === 0) { $accountId = $parameters[0] ?? 0; }